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-redback-core.git
commit 9157c68a6eb74ad3206fa663851edf28c8f5ea62 Author: Martin Stockhammer <[email protected]> AuthorDate: Sat Jun 27 11:24:53 2020 +0200 Consolidating version properties of poms --- pom.xml | 57 ++++++---------------- redback-policy/pom.xml | 5 -- .../redback-users-cached/pom.xml | 6 --- .../redback-users-jpa/pom.xml | 6 --- redback-users/redback-users-tests/pom.xml | 6 --- 5 files changed, 14 insertions(+), 66 deletions(-) diff --git a/pom.xml b/pom.xml index 1d7951d..c861d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -72,20 +72,10 @@ </distributionManagement> <properties> - <springVersion>4.3.10.RELEASE</springVersion> - <commons-collections.version>4.1</commons-collections.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <gpg.useagent>true</gpg.useagent> - <cxf.version>3.2.11</cxf.version> - <jackson.version>2.9.10</jackson.version> - <javax.ws.rs.version>2.1.1</javax.ws.rs.version> - - <junit.platform.version>1.5.2</junit.platform.version> - <junit.jupiter.version>5.5.2</junit.jupiter.version> - <junit.4.version>4.12</junit.4.version> - <!-- <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl> <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver> @@ -102,8 +92,6 @@ <!-- The git repository, where the site content is placed --> <siteRepositoryUrl>scm:git:https://gitbox.apache.org/repos/asf/archiva-web-content.git</siteRepositoryUrl> - <javax.servlet.version>4.0.1</javax.servlet.version> - </properties> <repositories> @@ -410,7 +398,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>${commons-collections.version}</version> + <version>${commons.collections.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -446,27 +434,27 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -477,27 +465,27 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> - <version>${springVersion}</version> + <version>${spring.version}</version> </dependency> <dependency> @@ -510,11 +498,6 @@ <artifactId>redback-rest-services</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>13.0.1</version> - </dependency> <!-- using apacheds client api rather than com.sun.jndi.ldap issue is apacheds client doesn't getDirContext @@ -537,16 +520,11 @@ <version>1.4</version> </dependency> --> - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>1.0-2</version> - </dependency> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>${javax.ws.rs.version}</version> + <version>${javax.jaxrs.version}</version> <scope>provided</scope> </dependency> @@ -607,7 +585,7 @@ <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> - <version>1.4</version> + <version>${javax.mail.version}</version> <scope>provided</scope> </dependency> @@ -642,18 +620,11 @@ <version>${junit.jupiter.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.4.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>xmlunit</groupId> <artifactId>xmlunit</artifactId> - <version>1.3</version> + <version>${xmlunit.version}</version> </dependency> <dependency> <groupId>org.assertj</groupId> diff --git a/redback-policy/pom.xml b/redback-policy/pom.xml index 1d7dbff..3664659 100644 --- a/redback-policy/pom.xml +++ b/redback-policy/pom.xml @@ -101,11 +101,6 @@ <artifactId>junit-vintage-engine</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> <dependency> diff --git a/redback-users/redback-users-providers/redback-users-cached/pom.xml b/redback-users/redback-users-providers/redback-users-cached/pom.xml index 5f29480..a11d104 100644 --- a/redback-users/redback-users-providers/redback-users-cached/pom.xml +++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml @@ -89,12 +89,6 @@ <artifactId>junit-vintage-engine</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.archiva.components.registry</groupId> diff --git a/redback-users/redback-users-providers/redback-users-jpa/pom.xml b/redback-users/redback-users-providers/redback-users-jpa/pom.xml index 61a5630..1085bd3 100644 --- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml +++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml @@ -86,7 +86,6 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>${springVersion}</version> <scope>runtime</scope> </dependency> @@ -112,11 +111,6 @@ <artifactId>junit-vintage-engine</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.springframework</groupId> diff --git a/redback-users/redback-users-tests/pom.xml b/redback-users/redback-users-tests/pom.xml index 291fb82..2d7c917 100644 --- a/redback-users/redback-users-tests/pom.xml +++ b/redback-users/redback-users-tests/pom.xml @@ -67,12 +67,6 @@ <artifactId>junit-vintage-engine</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>compile</scope> - </dependency> - <dependency> <groupId>org.springframework</groupId>
