diff options
| author | Martin Stockhammer <martin.stockhammer@ars.de> | 2018-10-26 20:02:50 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2018-10-26 21:03:19 +0200 |
| commit | ba75d27818843851717870ba9ae83a5acca0af4c (patch) | |
| tree | 9f6d30b7ea07f54279719aeade3519f58543f62b /archiva-modules/archiva-base | |
| parent | c069d160f92e67669150a376fec6661025b2d4b8 (diff) | |
| download | archiva-ba75d27818843851717870ba9ae83a5acca0af4c.tar.gz archiva-ba75d27818843851717870ba9ae83a5acca0af4c.zip | |
Changing maven version and removing plexus deps
Diffstat (limited to 'archiva-modules/archiva-base')
7 files changed, 18 insertions, 0 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 72b129f2c..044310f6c 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -60,6 +60,10 @@ </exclusions> </dependency> <dependency> + <groupId>org.apache.archiva.redback.components</groupId> + <artifactId>expression-evaluator</artifactId> + </dependency> + <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <exclusions> @@ -106,6 +110,7 @@ <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-utils</artifactId> </dependency> + <!-- <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>expression-evaluator</artifactId> @@ -116,6 +121,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 2cfb88fb3..e7a3ea555 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -76,6 +76,7 @@ <groupId>org.apache.archiva</groupId> <artifactId>archiva-plexus-bridge</artifactId> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> @@ -86,6 +87,7 @@ </exclusion> </exclusions> </dependency> + --> <!-- test dependencies --> <dependency> diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index ffeee4d6c..0e92f1b11 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -75,10 +75,12 @@ <groupId>org.apache.archiva</groupId> <artifactId>maven2-repository</artifactId> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> </dependency> + --> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId> diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml index de6700c32..f72348434 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml @@ -68,6 +68,7 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> @@ -78,6 +79,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml index 3e85ac5a5..580f4c64e 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml @@ -60,6 +60,7 @@ <artifactId>indexer-core</artifactId> <classifier>shaded-lucene</classifier> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> @@ -70,6 +71,7 @@ </exclusion> </exclusions> </dependency> + --> </dependencies> <build> diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index b4b33a197..c58c0849b 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -123,6 +123,7 @@ <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-provider-api</artifactId> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> @@ -133,6 +134,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>org.apache.archiva.redback.components.registry</groupId> <artifactId>spring-registry-commons</artifactId> diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index daf444fdf..4c3ba0231 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -41,6 +41,7 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> @@ -51,6 +52,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> |