From 50906f4dcd00b0162298d1f86d72dcfc4d3caee9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Chris=20Andr=C3=A9?= <chris.andre@yoppworks.com>
Date: Fri, 22 May 2020 14:29:25 -0400
Subject: [PATCH] Java 11 migration: fixing problems on 'catalog-fe'

- Upgrade `jersey-bom` version variable to the most recent stable one
- Removed `jersey-common` version variable and replaced its references with `jersey-bom`

Issue-ID: SDC-3036
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: I414e3814d6d4fc1d927b302efb5dd08659676dc2
---
 .../application-config-rest-services/pom.xml                     | 9 ++-------
 pom.xml                                                          | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml
index d261f46f18..bba87f17f1 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/application-config-rest/application-config-rest-services/pom.xml
@@ -12,12 +12,7 @@
     <version>1.7.0-SNAPSHOT</version>
   </parent>
 
-  <properties>
-    <jersey-common.version>2.22.2</jersey-common.version>
-  </properties>
-
   <dependencies>
-
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-annotations</artifactId>
@@ -68,13 +63,13 @@
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-common</artifactId>
-      <version>${jersey-common.version}</version>
+      <version>${jersey-bom.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-server</artifactId>
-      <version>${jersey-common.version}</version>
+      <version>${jersey-bom.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 798ab3aabc..92ef75f0a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@ Modifications copyright (c) 2018-2019 Nokia
     <guava.version>18.0</guava.version>
     <janusgraph.version>0.3.1</janusgraph.version>
     <spring.version>4.3.18.RELEASE</spring.version>
-    <jersey-bom.version>2.27</jersey-bom.version>
+    <jersey-bom.version>2.30.1</jersey-bom.version>
     <netty.version>4.1.36.Final</netty.version>
     <servlet-api.version>3.1.0</servlet-api.version>
     <wire-mock.version>2.26.3</wire-mock.version>
-- 
2.16.6