diff options
| author |   Michael DÜrre <michael.duerre@highstreet-technologies.com> | 2021-04-09 08:01:19 +0200 |
|---|---|---|
| committer | Michael D�rre <michael.duerre@highstreet-technologies.com> | 2021-04-13 18:37:06 +0000 |
| commit | 6ae7e8a1bae83d407b22d8b066dd0bcca730e1bb (patch) | |
| tree | f2276fee4fcc61c3d89b942c63d6211e41617cda /sdnr/wt/featureaggregator | |
| parent | d702f00b71218c56af766363ce19f2459081d73c (diff) | |
weekly sdnr code sync
sync internal code progress
add istanbul database structure
cleanup dataprovider test
fix pom files
Issue-ID: CCSDK-3260
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Ic1daa6adda173dc8337a51fa930e05c05ee88e2c
Diffstat (limited to 'sdnr/wt/featureaggregator')
4 files changed, 9 insertions, 82 deletions
diff --git a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml index 48927a388..835528a9a 100644 --- a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml +++ b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml @@ -50,7 +50,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> + <artifactId>sdnr-wt-websocketmanager-feature</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> @@ -90,12 +90,5 @@ <type>xml</type> <classifier>features</classifier> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-devicemanager-adapter-manager-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> </dependencies> </project> diff --git a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml index 9c5bf7e3e..b8fb6bcc4 100644 --- a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml +++ b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml @@ -43,41 +43,6 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-apigateway-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-data-provider-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-netconfnode-state-service-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-devicemanager-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-devicemanager-oran-feature</artifactId> <version>${project.version}</version> <type>xml</type> @@ -106,20 +71,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-mountpoint-registrar-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-mountpoint-state-provider-feature</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>sdnr-wt-devicemanager-adapter-manager-feature</artifactId> <version>${project.version}</version> <type>xml</type> diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml index bc07537ec..9a4465b47 100644 --- a/sdnr/wt/featureaggregator/feature/pom.xml +++ b/sdnr/wt/featureaggregator/feature/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>sdnr-wt-websocketmanager2-feature</artifactId> + <artifactId>sdnr-wt-websocketmanager-feature</artifactId> <version>${project.version}</version> <type>xml</type> <classifier>features</classifier> diff --git a/sdnr/wt/featureaggregator/installer/pom.xml b/sdnr/wt/featureaggregator/installer/pom.xml index 819b7a144..d4fd6dfb9 100755 --- a/sdnr/wt/featureaggregator/installer/pom.xml +++ b/sdnr/wt/featureaggregator/installer/pom.xml @@ -41,6 +41,7 @@ <name>ccsdk-features :: ${project.artifactId}</name> <properties> + <application.name>sdnr-wt-installer</application.name> </properties> <dependencies> @@ -72,6 +73,12 @@ <type>xml</type> <classifier>features</classifier> </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-data-provider-setup</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <build> @@ -159,30 +166,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-sdnr-data-migration-tool</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>validate</phase> - <configuration> - <outputDirectory>${project.build.directory}/assembly/system/org/onap/ccsdk/features/sdnr/wt/sdnr-wt-data-provider-setup/${project.version}</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../../data-provider/setup/target</directory> - <includes> - <include>sdnr-dmt.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> |