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>
---
 utils/DmaapPublisher/pom.xml    |  2 +-
 utils/webseal-simulator/pom.xml | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/DmaapPublisher/pom.xml b/utils/DmaapPublisher/pom.xml
index 111f4f2adb..73ad30341c 100644
--- a/utils/DmaapPublisher/pom.xml
+++ b/utils/DmaapPublisher/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy</artifactId>
-      <version>2.4.11</version>
+      <version>${groovy.version}</version>
     </dependency>
 
     <dependency>
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index a56f5f0c4c..928dcfb5e5 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -60,6 +60,12 @@
       <artifactId>jetty-proxy</artifactId>
       <version>${jetty.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-http</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -67,6 +73,12 @@
       <artifactId>jetty-servlets</artifactId>
       <version>${jetty.version}</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-http</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Proxy servlet -->
-- 
cgit 1.2.3-korg