Set Jersey to LF approved version

The Linux Foundation have permitted only certain versions
of Jersey to be OK to use license wise. This fix configures
the APEX PDP to use Jersey version 2.26, a LF approved version.

Issue-ID: POLICY-905
Change-Id: I4f4cbf728ffb0cc49331aa61da68805f83880282
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

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 8be1131..0629e37 100644 (file)
--- 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 59a3560..251e09f 100644 (file)
--- 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 0c98437..42a636e 100644 (file)
--- 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>

diff --git a/pom.xml b/pom.xml
index 12b0d03..1cebbdb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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 5eeeeff..4b0adde 100644 (file)
--- 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>