This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit ba75d27818843851717870ba9ae83a5acca0af4c Author: Martin Stockhammer <[email protected]> AuthorDate: Fri Oct 26 20:02:50 2018 +0200 Changing maven version and removing plexus deps --- archiva-modules/archiva-base/archiva-configuration/pom.xml | 6 ++++++ .../archiva-consumers/archiva-core-consumers/pom.xml | 2 ++ archiva-modules/archiva-base/archiva-converter/pom.xml | 2 ++ archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml | 2 ++ archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml | 2 ++ archiva-modules/archiva-base/archiva-proxy/pom.xml | 2 ++ archiva-modules/archiva-base/archiva-transaction/pom.xml | 2 ++ archiva-modules/archiva-web/archiva-webapp-test/pom.xml | 5 +++++ archiva-modules/archiva-web/archiva-webapp/pom.xml | 2 ++ pom.xml | 10 +++++++--- 10 files changed, 32 insertions(+), 3 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 72b129f..044310f 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 2cfb88f..e7a3ea5 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 ffeee4d..0e92f1b 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 de6700c..f723484 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 3e85ac5..580f4c6 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 b4b33a1..c58c084 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 daf444f..4c3ba02 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> diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index a5267f9..51383b2 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -450,6 +450,7 @@ <seleniumRemote>${seleniumRemote}</seleniumRemote> <container.propertiesPortFilePath>${container.propertiesPortFilePath}</container.propertiesPortFilePath> <container.http.port>${container.http.port}</container.http.port> + <org.sonatype.inject.debug>true</org.sonatype.inject.debug> </systemPropertyVariables> </configuration> @@ -629,6 +630,10 @@ <name>log4j.configurationFile</name> <value>${project.build.directory}/test-classes/log4j2-test.xml</value> </systemProperty> + <systemProperty> + <name>org.sonatype.inject.debug</name> + <value>true</value> + </systemProperty> </systemProperties> </configuration> </execution> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 7152a5c..e8d26bb 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -219,6 +219,7 @@ </exclusions> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-slf4j-logging</artifactId> @@ -230,6 +231,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> diff --git a/pom.xml b/pom.xml index b7d998a..360ff45 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ <commons-io.version>2.5</commons-io.version> <commons-lang.version>2.6</commons-lang.version> - <maven3x.version>3.0.5</maven3x.version> + <maven3x.version>3.5.4</maven3x.version> <maven.version>2.0.8</maven.version> <aether.version>1.13.1</aether.version> @@ -92,10 +92,10 @@ <!-- restore when we will be able to use a derby in memory database --> <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl> <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver> - <sisu-inject-plexus.version>0.0.0.M2a</sisu-inject-plexus.version> + <sisu-inject-plexus.version>0.3.3</sisu-inject-plexus.version> <plexus-digest.version>1.1</plexus-digest.version> <plexus-expression-evaluator.version>2.1</plexus-expression-evaluator.version> - <plexus-utils.version>3.0.15</plexus-utils.version> + <plexus-utils.version>3.1.0</plexus-utils.version> <htmlUnitVersion>2.27</htmlUnitVersion> <release.preparationGoals>clean install</release.preparationGoals> @@ -884,11 +884,13 @@ <artifactId>maven-repository-metadata</artifactId> <version>${maven3x.version}</version> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> <version>${plexus-digest.version}</version> </dependency> + --> <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>expression-evaluator</artifactId> @@ -900,6 +902,7 @@ </exclusion> </exclusions> </dependency> + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> @@ -926,6 +929,7 @@ </exclusion> </exclusions> </dependency> + --> <dependency> <groupId>org.apache.archiva.redback.components</groupId> <artifactId>spring-taskqueue</artifactId>
