From a285920200ba5cdff0d2df4f794518a0db395922 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Tue, 22 Jun 2021 17:46:23 -0400
Subject: Further fixing invalid dependencies

Issue-ID: CCSDK-3347
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ib65bd3debdeebc4d04aba55e928e0a9ffcfac909
---
 .../features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java   | 2 +-
 sdnr/wt/devicemanager-onap/onf12/feature/pom.xml                     | 5 -----
 sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml         | 2 +-
 sdnr/wt/mountpoint-registrar/provider/pom.xml                        | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
index fd6be82db..90b5fd9af 100644
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/about/AboutHttpServlet.java
@@ -314,7 +314,7 @@ public class AboutHttpServlet extends HttpServlet {
             if(!(name.contains("devicemanager") && name.contains("provider"))) {
                 continue;
             }
-            if(name.equals("org.onap.ccsdk.features.sdnr.wt.sdnr-wt-devicemanager-provider")) {
+            if(name.equals("org.onap.ccsdk.features.sdnr.wt.sdnr-wt-devicemanager-core-provider")) {
                 continue;
             }
             table.addRow(new String[] {String.valueOf(bundle.getBundleId()), bundle.getVersion().toString(), name,
diff --git a/sdnr/wt/devicemanager-onap/onf12/feature/pom.xml b/sdnr/wt/devicemanager-onap/onf12/feature/pom.xml
index de83dc9bf..41604dacb 100644
--- a/sdnr/wt/devicemanager-onap/onf12/feature/pom.xml
+++ b/sdnr/wt/devicemanager-onap/onf12/feature/pom.xml
@@ -41,11 +41,6 @@
     <name>ccsdk-features :: ${project.artifactId}</name>
 
     <dependencies>
-        <!--     <dependency> -->
-        <!--       <groupId>${project.groupId}</groupId> -->
-        <!--       <artifactId>sdnr-wt-devicemanager-onap-onf-model</artifactId> -->
-        <!--       <version>${project.version}</version> -->
-        <!--     </dependency> -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-devicemanager-onap-onf12-provider</artifactId>
diff --git a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
index 835528a9a..ca50f1133 100644
--- a/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
+++ b/sdnr/wt/featureaggregator/feature-devicemanager-base/pom.xml
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-feature</artifactId>
+            <artifactId>sdnr-wt-devicemanager-core-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
diff --git a/sdnr/wt/mountpoint-registrar/provider/pom.xml b/sdnr/wt/mountpoint-registrar/provider/pom.xml
index e02976f71..4a6a3f021 100644
--- a/sdnr/wt/mountpoint-registrar/provider/pom.xml
+++ b/sdnr/wt/mountpoint-registrar/provider/pom.xml
@@ -113,7 +113,7 @@
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-devicemanager-model</artifactId>
+            <artifactId>sdnr-wt-devicemanager-core-model</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-- 
cgit 1.2.3-korg