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 c1d38148365d3372f6860e7c40f0d7128611ca54 Author: Martin Stockhammer <[email protected]> AuthorDate: Sun Jan 26 23:18:05 2020 +0100 Dependency update --- .../archiva-web/archiva-webapp-test/pom.xml | 4 - pom.xml | 344 +++++++++++---------- 2 files changed, 174 insertions(+), 174 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index de0e098..6aa386c 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -252,10 +252,6 @@ <!-- Dependency for MavenConnectionTest --> <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - </dependency> - <dependency> <groupId>jaxen</groupId> <artifactId>jaxen</artifactId> </dependency> diff --git a/pom.xml b/pom.xml index 72685fc..fd7d8f8 100644 --- a/pom.xml +++ b/pom.xml @@ -123,18 +123,7 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <version>3.13.2</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.junit</groupId> - <artifactId>junit-bom</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> <groupId>javax.inject</groupId> @@ -171,6 +160,11 @@ <artifactId>jaxb-api</artifactId> <version>${javax.jaxb.version}</version> </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>2.0</version> + </dependency> <dependency> @@ -352,10 +346,141 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-plexus-bridge</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-model</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-policies</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-proxy</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-proxy</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-layer</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-scanner</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-repository-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-repository</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-scheduler-indexing</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva.maven</groupId> + <artifactId>archiva-maven-scheduler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-security</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-security-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-signature-consumers</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-transaction</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-docs</artifactId> + <version>${project.version}</version> + <type>zip</type> + <classifier>docs</classifier> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-webapp</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-xml-tools</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-webdav</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-web-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-rss</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>stage-repository-merge</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-test-utils</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> + + + <!-- Jackrabbit OAK JCR Provider --> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-jcr</artifactId> @@ -400,6 +525,7 @@ </dependency> + <!-- Maven dependencies --> <dependency> <groupId>org.apache.maven.indexer</groupId> <artifactId>indexer-reader</artifactId> @@ -485,135 +611,6 @@ </exclusions> </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-plexus-bridge</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-model</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-policies</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-proxy-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-proxy</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva.maven</groupId> - <artifactId>archiva-maven-proxy</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-layer</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-scanner</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-scheduler-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-scheduler-repository-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-scheduler-repository</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-scheduler-indexing</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva.maven</groupId> - <artifactId>archiva-maven-scheduler</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-security</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-security-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-signature-consumers</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-transaction</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-docs</artifactId> - <version>${project.version}</version> - <type>zip</type> - <classifier>docs</classifier> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-webapp</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-xml-tools</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-webdav</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-web-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-rss</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>stage-repository-merge</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>com.lmax</groupId> @@ -660,11 +657,7 @@ </exclusions> </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> - </dependency> + <!-- normally not needed as we are 1.6 required but due to http://jira.codehaus.org/browse/MODELLO-266 @@ -1624,11 +1617,6 @@ <version>2.2.2</version> </dependency> <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-model-converter</artifactId> <version>${maven-model-converter.version}</version> @@ -1643,7 +1631,7 @@ <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> - <version>2.7.5</version> + <version>${ehcache.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -1652,24 +1640,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>${mockito.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.kubek2k</groupId> - <artifactId>springockito</artifactId> - <version>${springockito.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> <version>${jsoup.version}</version> @@ -1713,6 +1683,40 @@ <version>${metrics-core.version}</version> </dependency> + <!-- Testing and mock frameworks --> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.13.2</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.junit</groupId> + <artifactId>junit-bom</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockito.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.kubek2k</groupId> + <artifactId>springockito</artifactId> + <version>${springockito.version}</version> + <scope>test</scope> + </dependency> + + <!-- JUNIT 5 --> <dependency> <groupId>org.junit.platform</groupId>
