Repository: incubator-brooklyn Updated Branches: refs/heads/master cf286fea0 -> 882a4d68e
Review rest-client's dependencies In particular, the dependency on org.eclipse.jetty:jetty-server should be restricted to the test scope! Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d8dcbb04 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d8dcbb04 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d8dcbb04 Branch: refs/heads/master Commit: d8dcbb04277e856787341e5c6c7937ccee1029b4 Parents: 8f384a1 Author: Sam Corbett <[email protected]> Authored: Thu Nov 19 11:06:29 2015 +0000 Committer: Sam Corbett <[email protected]> Committed: Thu Nov 19 11:06:29 2015 +0000 ---------------------------------------------------------------------- usage/rest-client/pom.xml | 57 +++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d8dcbb04/usage/rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml index b3d9289..a583672 100644 --- a/usage/rest-client/pom.xml +++ b/usage/rest-client/pom.xml @@ -65,32 +65,17 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>jaxrs-api</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-xc</artifactId> - </dependency> - <dependency> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-utils-common</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-webapp</artifactId> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> </dependency> <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -101,13 +86,21 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - </dependency> - <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> + <!-- + mvn dependency:analyze complains that these dependencies are unused when present but + used and undeclared when removed! + --> + <!--dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>jaxrs-api</artifactId> + </dependency--> <dependency> <groupId>org.testng</groupId> @@ -115,6 +108,17 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.brooklyn</groupId> + <artifactId>brooklyn-core</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> @@ -140,6 +144,7 @@ <version>${project.version}</version> <scope>test</scope> </dependency> + <!-- Used in ApplicationResourceIntegrationTest --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-software-nosql</artifactId>
