Don't hard-code the Jersey version number, use a property instead.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/ed3ba7c3 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ed3ba7c3 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ed3ba7c3 Branch: refs/heads/two-dot-o-dev Commit: ed3ba7c3991793bebed6fea4b25b7543a21e530e Parents: cdf7c29 Author: Dave Johnson <[email protected]> Authored: Tue Sep 8 16:38:12 2015 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue Sep 8 16:38:12 2015 -0400 ---------------------------------------------------------------------- stack/pom.xml | 2 +- stack/rest/pom.xml | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/ed3ba7c3/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index 15cca38..47a08d7 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -107,7 +107,7 @@ <jackson-version>1.9.9</jackson-version> <jackson-2-version>2.3.3</jackson-2-version> <jclouds.version>1.9.0</jclouds.version> - <!--<jersey-version>1.19</jersey-version>--> + <jersey-version>2.21</jersey-version> <junit-version>4.12</junit-version> <log4j-version>1.2.16</log4j-version> <org.springframework.version>3.2.13.RELEASE</org.springframework.version> http://git-wip-us.apache.org/repos/asf/usergrid/blob/ed3ba7c3/stack/rest/pom.xml ---------------------------------------------------------------------- diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml index bea05fe..ebbc375 100644 --- a/stack/rest/pom.xml +++ b/stack/rest/pom.xml @@ -238,43 +238,43 @@ <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.connectors</groupId> <artifactId>jersey-apache-connector</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-mvc-jsp</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-spring3</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <!-- Jackson, Spring, and other dependencies --> @@ -361,6 +361,14 @@ </dependency> <dependency> + <groupId>org.apache.usergrid</groupId> + <artifactId>usergrid-services</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> @@ -393,13 +401,13 @@ <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-external</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework</groupId> <artifactId>jersey-test-framework-core</artifactId> - <version>2.21</version> + <version>${jersey-version}</version> </dependency> <dependency> @@ -408,14 +416,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.usergrid</groupId> - <artifactId>usergrid-services</artifactId> - <version>2.1.0-SNAPSHOT</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - </dependencies> </project>
