From 086406a3af88a1f77e2be783e6f458dc3c66d4ca Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Mon, 22 Feb 2021 09:50:07 +0000
Subject: Fix locally failing TCs in catalog-be

Migrate to Junit 5 TCs that extends JerseyTest

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: I4c81e70836ee5e634291d74cd1773d221dce3702
Issue-ID: SDC-3377
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
---
 .../application-config-rest-services/pom.xml                      | 8 ++------
 .../api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml        | 7 ++++++-
 .../api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml     | 8 +++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'openecomp-be/api/openecomp-sdc-rest-webapp')

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 f93c08dbb1..aacab744e6 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,10 +12,6 @@
     <version>1.8.1-SNAPSHOT</version>
   </parent>
 
-  <properties>
-    <jersey-common.version>2.22.2</jersey-common.version>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -74,13 +70,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/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
index 3fd8dc526b..9f3c3e7d12 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/notifications-fe/pom.xml
@@ -16,7 +16,6 @@
     </parent>
 
     <properties>
-        <jetty.version>9.4.18.v20190429</jetty.version>
     </properties>
 
     <dependencies>
@@ -51,6 +50,12 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
             <version>${jetty.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- START required for websocket -->
         <dependency>
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
index 163866c587..f008a8f15b 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/pom.xml
@@ -125,7 +125,13 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlets</artifactId>
-            <version>${jetty.servlets.version}</version>
+            <version>${jetty.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty</groupId>
+                    <artifactId>jetty-http</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.openecomp.sdc</groupId>
-- 
cgit 1.2.3-korg