diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2020-01-30 22:34:43 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2020-01-30 22:34:43 +0100 |
| commit | 8d6062c209f3574a8d91c45d00e6fcbce816fbd1 (patch) | |
| tree | e845c5d6c85b11d89c837009188db1bfae5fc06b /archiva-modules | |
| parent | 52ed4a352c9e850d888ba460ca8d2399e4cd3c56 (diff) | |
| download | archiva-8d6062c209f3574a8d91c45d00e6fcbce816fbd1.tar.gz archiva-8d6062c209f3574a8d91c45d00e6fcbce816fbd1.zip | |
Cleanup of dependencies
Diffstat (limited to 'archiva-modules')
| -rw-r--r-- | archiva-modules/archiva-base/archiva-configuration/pom.xml | 56 | ||||
| -rw-r--r-- | archiva-modules/archiva-base/archiva-filelock/pom.xml | 7 |
2 files changed, 24 insertions, 39 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 792ec36f9..ec79c4386 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -75,50 +75,34 @@ <groupId>org.apache.archiva.components</groupId> <artifactId>archiva-components-expression-evaluator</artifactId> </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>javax.annotation-api</artifactId> + </dependency> + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-configuration2</artifactId> + <scope>runtime</scope> <exclusions> <exclusion> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils-core</artifactId> - </exclusion> - <!-- targeting JDK 1.4, xml parser/apis not needed --> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </exclusion> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>servletapi</groupId> - <artifactId>servletapi</artifactId> - </exclusion> - <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> - <exclusion> - <groupId>ant</groupId> - <artifactId>ant-optional</artifactId> - </exclusion> </exclusions> </dependency> + <!-- <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.2</version> </dependency> + --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -131,22 +115,16 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> + <!-- <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> </dependency> + --> <!-- Test scope --> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - </dependency> <dependency> <groupId>org.easymock</groupId> diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml index 258597bda..448aa428e 100644 --- a/archiva-modules/archiva-base/archiva-filelock/pom.xml +++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml @@ -67,6 +67,13 @@ <scope>test</scope> </dependency> + <!-- + NOTE: + The multithreadedtc project looks abandoned. + But I have no suitable alternative found yet. + So we keep this version as long as it works with our java versions. + MST + --> <dependency> <groupId>com.googlecode.multithreadedtc</groupId> <artifactId>multithreadedtc</artifactId> |