diff options
| author |   KAPIL SINGAL <ks220y@att.com> | 2020-01-31 20:34:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-31 20:34:16 +0000 |
| commit | 84cf604e3f06942a62ae0478327ec6100787761e (patch) | |
| tree | aa3feeabdd73ee58d8815c86576b7a0bc6d7d0d1 /sdnr | |
| parent | d77d01bae41b5c8331a6de6eff1a64e08cd9e279 (diff) | |
| parent | 24e33a8aa73a1904fe61775ff34de44319b0e1b9 (diff) | |
Merge "update websocketmanager"
Diffstat (limited to 'sdnr')
| -rw-r--r-- | sdnr/wt/websocketmanager2/feature/pom.xml | 2 | ||||
| -rwxr-xr-x | sdnr/wt/websocketmanager2/installer/pom.xml | 19 | ||||
| -rw-r--r-- | sdnr/wt/websocketmanager2/provider/pom.xml | 31 |
3 files changed, 2 insertions, 50 deletions
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> |