diff options
| author |   Jorge Hernandez <jh1730@att.com> | 2018-07-06 13:37:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-06 13:37:44 +0000 |
| commit | 6bc18bc966bc9448505e55dec9ee11a8cea9a38c (patch) | |
| tree | bbae593fa407c809a56e8b7e1fd0427483f4bcc1 | |
| parent | f149399d9fed5949bf9afc3eeac1da9bf0b905fa (diff) | |
| parent | a40a383844be0ec6d0353948a5b29546e9662d06 (diff) | |
Merge "Set Jersey to LF approved version"
5 files changed, 14 insertions, 15 deletions
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml index 8be1131e6..0629e3707 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${version.jersey.core}</version> + <version>${version.jersey}</version> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.services</groupId> @@ -46,4 +46,4 @@ <version>${project.version}</version> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml index 59a35603f..251e09fc1 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${version.jersey.core}</version> + <version>${version.jersey}</version> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.services</groupId> @@ -48,7 +48,7 @@ <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> - <version>${version.grizzly2-http}</version> + <version>${version.jersey}</version> <scope>test</scope> </dependency> <dependency> @@ -66,7 +66,7 @@ <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> - <version>${version.grizzly2-http}</version> + <version>${version.jersey}</version> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml index 0c984377e..42a636e02 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml @@ -43,17 +43,17 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${version.jersey.core}</version> + <version>${version.jersey}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> - <version>${version.grizzly2-http}</version> + <version>${version.jersey}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> - <version>${version.jersey.core}</version> + <version>${version.jersey}</version> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> @@ -42,8 +42,7 @@ <version.derby>10.13.1.1</version.derby> <version.commons-cli>1.4</version.commons-cli> <version.kafka>0.10.2.1</version.kafka> - <version.grizzly2-http>2.27</version.grizzly2-http> - <version.jersey.core>2.27</version.jersey.core> + <version.jersey>2.26</version.jersey> <version.eclipselink>2.6.5</version.eclipselink> </properties> diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml index 5eeeeffe3..4b0adde97 100644 --- a/testsuites/integration/integration-uservice-test/pom.xml +++ b/testsuites/integration/integration-uservice-test/pom.xml @@ -196,18 +196,18 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>${version.jersey.core}</version> + <version>${version.jersey}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> - <version>${version.grizzly2-http}</version> + <version>${version.jersey}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-servlet-core</artifactId> - <version>${version.jersey.core}</version> + <version>${version.jersey}</version> </dependency> </dependencies> |