From: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Date: Mon, 19 Jul 2021 14:23:56 +0000 (+0200)
Subject: Fix dependencies
X-Git-Tag: 1.2.0~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2aa3a5dd6c190bf0a6c398bf7bf69e359eff2f9d;p=ccsdk%2Ffeatures.git

Fix dependencies

fix conflicting dependencies of sdnr-wt-websocketmanager-feature and resource-assignment-provider

Issue-ID: CCSDK-3375
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I2d4dda0f1856431351c818a3bd4b24a2a8cb6dca
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
---

diff --git a/sdnr/wt/websocketmanager/provider/pom.xml b/sdnr/wt/websocketmanager/provider/pom.xml
index fcdaa5e2f..746803f62 100644
--- a/sdnr/wt/websocketmanager/provider/pom.xml
+++ b/sdnr/wt/websocketmanager/provider/pom.xml
@@ -66,27 +66,10 @@
             <artifactId>sdnr-wt-yang-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.websocket</groupId>
-            <artifactId>websocket-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-servlet</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <!-- <version>${netty.version}</version> -->
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
@@ -129,16 +112,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-devicemanager-core-provider</artifactId>