This is an automated email from the ASF dual-hosted git repository. gaul pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 0dc92e510337d72bbf3357a1df356e6aeb84d61a Author: gurkerl83 <[email protected]> AuthorDate: Mon Oct 26 14:58:39 2020 +0100 Reorder dependencies for core module Reorder dependencies, integrate library javax.ws.rs-api in the parents' dependency management section --- core/pom.xml | 47 +++++++++++++++++++++++------------------------ project/pom.xml | 6 ++++++ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index a674d71..6a85d41 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -38,35 +38,24 @@ <dependencies> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0.1</version> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> </dependency> <dependency> - <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assistedinject</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-security</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.squareup.okhttp</groupId> - <artifactId>mockwebserver</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-assistedinject</artifactId> </dependency> <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> </dependency> <dependency> <groupId>org.osgi</groupId> @@ -79,11 +68,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.google.auto.value</groupId> - <artifactId>auto-value</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.google.auto.service</groupId> <artifactId>auto-service</artifactId> <optional>true</optional> @@ -93,6 +77,21 @@ <artifactId>modernizer-maven-annotations</artifactId> <optional>true</optional> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.squareup.okhttp</groupId> + <artifactId>mockwebserver</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.auto.value</groupId> + <artifactId>auto-value</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> diff --git a/project/pom.xml b/project/pom.xml index c788ea4..02bc9b9 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -239,6 +239,7 @@ <java-xmlbuilder.version>1.2</java-xmlbuilder.version> <jetty.version>8.1.8.v20121106</jetty.version> + <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> <modernizer-maven-annotations.version>1.8.0</modernizer-maven-annotations.version> @@ -331,6 +332,11 @@ <artifactId>jetty-server</artifactId> <version>${jetty.version}</version> </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <version>${javax.ws.rs-api.version}</version> + </dependency> <dependency> <groupId>org.gaul</groupId>
