From: Michael Dürre <michael.duerre@highstreet-technologies.com>
Date: Thu, 30 Jan 2020 12:22:52 +0000 (+0100)
Subject: update websocketmanager
X-Git-Tag: 0.7.1~36^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F100936%2F2;p=ccsdk%2Ffeatures.git

update websocketmanager

cleaned up pom files

Issue-ID: SDNC-1028
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: Ib222fe89485122b0c0b724419885156295af64db
---

diff --git a/sdnr/wt/websocketmanager2/feature/pom.xml b/sdnr/wt/websocketmanager2/feature/pom.xml
index 0ca28c77e..d557f18ae 100644
--- a/sdnr/wt/websocketmanager2/feature/pom.xml
+++ b/sdnr/wt/websocketmanager2/feature/pom.xml
@@ -36,7 +36,7 @@
     <version>0.7.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>ccsdk-features :: ${project.artifactId}</name>
+    <name>ccsdk-features :: ${project.artifactId} :: feature</name>
 
     <dependencyManagement>
         <dependencies>
diff --git a/sdnr/wt/websocketmanager2/installer/pom.xml b/sdnr/wt/websocketmanager2/installer/pom.xml
index 3abe1a31b..7c2ccffc1 100755
--- a/sdnr/wt/websocketmanager2/installer/pom.xml
+++ b/sdnr/wt/websocketmanager2/installer/pom.xml
@@ -90,25 +90,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-                    <!--           <execution> -->
-                    <!--             <id>copy-dependencies</id> -->
-                    <!--             <goals> -->
-                    <!--               <goal>copy-dependencies</goal> -->
-                    <!--             </goals> -->
-                    <!--             <phase>prepare-package</phase> -->
-                    <!--             <configuration> -->
-                    <!--               <transitive>false</transitive> -->
-                    <!--               <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> -->
-                    <!--               <overWriteReleases>false</overWriteReleases> -->
-                    <!--               <overWriteSnapshots>true</overWriteSnapshots> -->
-                    <!--               <overWriteIfNewer>true</overWriteIfNewer> -->
-                    <!--               <useRepositoryLayout>true</useRepositoryLayout> -->
-                    <!--               <addParentPoms>false</addParentPoms> -->
-                    <!--               <copyPom>false</copyPom> -->
-                    <!--               <includeArtifactIds>${application.name}-model,${application.name}-provider,${application.name}</includeArtifactIds> -->
-                    <!--               <scope>provided</scope> -->
-                    <!--             </configuration> -->
-                    <!--           </execution> -->
                     <execution>
                         <id>copy-nested-dependencies</id>
                         <goals>
diff --git a/sdnr/wt/websocketmanager2/provider/pom.xml b/sdnr/wt/websocketmanager2/provider/pom.xml
index 1e1b4b764..2e512b1a2 100644
--- a/sdnr/wt/websocketmanager2/provider/pom.xml
+++ b/sdnr/wt/websocketmanager2/provider/pom.xml
@@ -38,17 +38,6 @@
         <checkstyle.skip>true</checkstyle.skip>
     </properties>
 
-    <!--     <dependencyManagement> -->
-    <!--         <dependencies> -->
-    <!--             <dependency> -->
-    <!--                 <groupId>org.opendaylight.controller</groupId> -->
-    <!--                 <artifactId>mdsal-artifacts</artifactId> -->
-    <!--                 <version>1.6.1</version> -->
-    <!--                 <type>pom</type> -->
-    <!--                 <scope>import</scope> -->
-    <!--             </dependency> -->
-    <!--         </dependencies> -->
-    <!--     </dependencyManagement> -->
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -74,7 +63,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <!-- <version>${netty.version}</version> -->
+      <!-- <version>${netty.version}</version> -->
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -95,7 +84,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <!-- <version>2.23.4</version> -->
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -120,23 +108,6 @@
             <artifactId>jetty-servlet</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--     <dependency> -->
-        <!--       <groupId>org.eclipse.jetty.websocket</groupId> -->
-        <!--       <artifactId>websocket-api</artifactId> -->
-        <!--       <version>9.3.24.v20180605</version> -->
-        <!--     </dependency> -->
-        <!-- To run websockets in embedded server -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.eclipse.jetty.websocket</groupId> -->
-        <!-- <artifactId>websocket-server</artifactId> -->
-        <!-- <version>9.3.24.v20180605</version> -->
-        <!-- </dependency> -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.eclipse.jetty.websocket</groupId> -->
-        <!-- <artifactId>websocket-server</artifactId> -->
-        <!-- <version>9.3.24.v20180605</version> -->
-        <!-- <scope>test</scope> -->
-        <!-- </dependency> -->
     </dependencies>
 
     <build>