From 33ac3a6dcef36543e1c9b4b0853ecee389cbe387 Mon Sep 17 00:00:00 2001
From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Mon, 9 Aug 2021 09:37:44 +0530
Subject: Update featureaggregator

Include openroadm71 feature

Issue-ID: CCSDK-3418
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I764c2149e1e33aef8a11777f3d7941e65ed9ed99
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
---
 sdnr/wt/devicemanager-onap/pom.xml                 |  1 +
 .../feature-devicemanager/pom.xml                  | 15 +++++++++++---
 sdnr/wt/featureaggregator/feature/pom.xml          | 24 ++++++++++++++++------
 sdnr/wt/featureaggregator/pom.xml                  |  2 +-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/sdnr/wt/devicemanager-onap/pom.xml b/sdnr/wt/devicemanager-onap/pom.xml
index 7c14e88a9..9cc5c6fd9 100644
--- a/sdnr/wt/devicemanager-onap/pom.xml
+++ b/sdnr/wt/devicemanager-onap/pom.xml
@@ -34,5 +34,6 @@
         <module>onf12</module>
         <module>onf14</module>
         <module>openroadm</module>
+        <module>openroadm71</module>
     </modules>
 </project>
diff --git a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
index d1632b3ba..6859b5dd1 100644
--- a/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
+++ b/sdnr/wt/featureaggregator/feature-devicemanager/pom.xml
@@ -41,9 +41,17 @@
     <name>ccsdk-features :: ${project.artifactId}</name>
 
     <dependencies>
+        <!--  ONAP Devicemanagers go here -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-feature</artifactId>
+            <artifactId>sdnr-wt-devicemanager-onap-onf12-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-onap-adapter-manager-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
@@ -57,7 +65,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-onap-onf12-feature</artifactId>
+            <artifactId>sdnr-wt-devicemanager-onap-openroadm71-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
@@ -69,9 +77,10 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <!--  O-RAN-SC  Devicemanagers go here-->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-onap-adapter-manager-feature</artifactId>
+            <artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
diff --git a/sdnr/wt/featureaggregator/feature/pom.xml b/sdnr/wt/featureaggregator/feature/pom.xml
index 61d2bb07b..28efa8d84 100644
--- a/sdnr/wt/featureaggregator/feature/pom.xml
+++ b/sdnr/wt/featureaggregator/feature/pom.xml
@@ -41,6 +41,7 @@
     <name>ccsdk-features :: ${project.artifactId}</name>
 
     <dependencies>
+        <!--  Common Components go here -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-apigateway-feature</artifactId>
@@ -78,25 +79,27 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-core-feature</artifactId>
+            <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-devicemanager-o-ran-sc-oran-feature</artifactId>
+            <artifactId>sdnr-wt-mountpoint-state-provider-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <!--  Core a.k.a base devicemanager -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-onap-openroadm-feature</artifactId>
+            <artifactId>sdnr-wt-devicemanager-core-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <!--  ONAP devicemanagers go here -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-devicemanager-onap-onf12-feature</artifactId>
@@ -113,25 +116,34 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-devicemanager-onap-adapter-manager-feature</artifactId>
+            <artifactId>sdnr-wt-devicemanager-onap-openroadm-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sdnr-wt-mountpoint-registrar-feature</artifactId>
+            <artifactId>sdnr-wt-devicemanager-onap-openroadm71-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>
+            <artifactId>sdnr-wt-devicemanager-onap-adapter-manager-feature</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <!-- O-RAN-SC Devicemanagers go here -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-devicemanager-o-ran-sc-oran-feature</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <!--  ODLUX components go here -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-odlux-core-feature</artifactId>
diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml
index 028e4eb81..ef188e41f 100755
--- a/sdnr/wt/featureaggregator/pom.xml
+++ b/sdnr/wt/featureaggregator/pom.xml
@@ -42,9 +42,9 @@
 
     <modules>
         <module>feature</module>
+        <module>feature-oauth</module>
         <module>feature-devicemanager</module>
         <module>feature-devicemanager-base</module>
-        <module>feature-oauth</module>
         <module>installer</module>
     </modules>
 </project>
-- 
cgit 1.2.3-korg