From 286e39cb3cd5e3f0fa7e69053ee948f3057d24e1 Mon Sep 17 00:00:00 2001
From: herbert <herbert.eiselt@highstreet-technologies.com>
Date: Thu, 19 Mar 2020 17:53:08 +0100
Subject: [PATCH] Add parent poms and rework devicemanager poms

Issue-ID: OAM-78
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I0b88a43fba11fe5e6febe39b23e74d77ea0902e2
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
---
 features/devicemanager/o-ran/ru-fh/feature/pom.xml |   4 +-
 .../devicemanager/o-ran/ru-fh/installer/pom.xml    |   4 +-
 features/devicemanager/o-ran/ru-fh/model/pom.xml   |   5 +-
 features/devicemanager/o-ran/ru-fh/pom.xml         |   5 +-
 .../devicemanager/o-ran/ru-fh/provider/pom.xml     |   9 +-
 features/devicemanager/x-ran/ru-fh/feature/pom.xml |   5 +-
 .../devicemanager/x-ran/ru-fh/installer/pom.xml    |   5 +-
 features/devicemanager/x-ran/ru-fh/model/pom.xml   |   5 +-
 features/devicemanager/x-ran/ru-fh/pom.xml         |   5 +-
 .../devicemanager/x-ran/ru-fh/provider/pom.xml     |   7 +-
 features/parent/binding-parent/pom.xml             | 103 ++++++++++++
 features/parent/odlparent-lite/pom.xml             |  86 ++++++++++
 features/parent/single-feature-parent/pom.xml      |  86 ++++++++++
 features/pom.xml                                   |  11 +-
 features/settings.onap.xml                         | 173 ---------------------
 15 files changed, 300 insertions(+), 213 deletions(-)
 create mode 100644 features/parent/binding-parent/pom.xml
 create mode 100644 features/parent/odlparent-lite/pom.xml
 create mode 100644 features/parent/single-feature-parent/pom.xml
 delete mode 100644 features/settings.onap.xml

diff --git a/features/devicemanager/o-ran/ru-fh/feature/pom.xml b/features/devicemanager/o-ran/ru-fh/feature/pom.xml
index ea5fefd..4881428 100644
--- a/features/devicemanager/o-ran/ru-fh/feature/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/feature/pom.xml
@@ -27,9 +27,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/devicemanager/o-ran/ru-fh/installer/pom.xml b/features/devicemanager/o-ran/ru-fh/installer/pom.xml
index 4f798d4..4875b88 100644
--- a/features/devicemanager/o-ran/ru-fh/installer/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/installer/pom.xml
@@ -27,9 +27,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/features/devicemanager/o-ran/ru-fh/model/pom.xml b/features/devicemanager/o-ran/ru-fh/model/pom.xml
index ceb4169..cabc18e 100644
--- a/features/devicemanager/o-ran/ru-fh/model/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/model/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-oran-ru-fh-model</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
diff --git a/features/devicemanager/o-ran/ru-fh/pom.xml b/features/devicemanager/o-ran/ru-fh/pom.xml
index 20836d1..b4a99dc 100644
--- a/features/devicemanager/o-ran/ru-fh/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-oran-ru-fh-top</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
diff --git a/features/devicemanager/o-ran/ru-fh/provider/pom.xml b/features/devicemanager/o-ran/ru-fh/provider/pom.xml
index d7f9fbd..b75e487 100644
--- a/features/devicemanager/o-ran/ru-fh/provider/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/provider/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-oran-ru-fh-provider</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
@@ -71,13 +70,13 @@
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-devicemanager-model</artifactId>
-            <version>${project.version}</version>
+            <version>0.7.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-            <version>${project.version}</version>
+            <version>0.7.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/features/devicemanager/x-ran/ru-fh/feature/pom.xml b/features/devicemanager/x-ran/ru-fh/feature/pom.xml
index ff05924..fa92207 100644
--- a/features/devicemanager/x-ran/ru-fh/feature/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/feature/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-feature</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>x-ran-sc-features :: ${project.artifactId}</name>
diff --git a/features/devicemanager/x-ran/ru-fh/installer/pom.xml b/features/devicemanager/x-ran/ru-fh/installer/pom.xml
index de31294..8b1be28 100755
--- a/features/devicemanager/x-ran/ru-fh/installer/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/installer/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-installer</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
diff --git a/features/devicemanager/x-ran/ru-fh/model/pom.xml b/features/devicemanager/x-ran/ru-fh/model/pom.xml
index dd0b95e..cbcc935 100644
--- a/features/devicemanager/x-ran/ru-fh/model/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/model/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-model</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
diff --git a/features/devicemanager/x-ran/ru-fh/pom.xml b/features/devicemanager/x-ran/ru-fh/pom.xml
index f4e46b2..ce5f041 100755
--- a/features/devicemanager/x-ran/ru-fh/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-top</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
diff --git a/features/devicemanager/x-ran/ru-fh/provider/pom.xml b/features/devicemanager/x-ran/ru-fh/provider/pom.xml
index 5ddc7da..fd52afc 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/provider/pom.xml
@@ -27,15 +27,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-provider</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
@@ -71,13 +70,11 @@
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-devicemanager-model</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/features/parent/binding-parent/pom.xml b/features/parent/binding-parent/pom.xml
new file mode 100644
index 0000000..396d93b
--- /dev/null
+++ b/features/parent/binding-parent/pom.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+################################################################################
+# Copyright 2019 highstreet technologies and others
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>1.5.2</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.o-ran-sc.oam.features.parent</groupId>
+  <artifactId>binding-parent</artifactId>
+  <version>0.7.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>o-ran-sc features binding-parent</name>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+        <artifactId>sdnr-wt-devicemanager-model</artifactId>
+        <version>0.7.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+        <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
+        <version>0.7.1</version>
+        <scope>provided</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <repositories>
+    <repository>
+      <id>onap-public</id>
+      <url>https://nexus.onap.org/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>onap-staging</id>
+      <url>https://nexus.onap.org/content/groups/staging/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>ecomp-release</id>
+      <name>onap-repository-releases</name>
+      <url>https://nexus.onap.org/content/repositories/releases/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>ecomp-snapshot</id>
+      <name>onap-repository-snapshots</name>
+      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+</project>
diff --git a/features/parent/odlparent-lite/pom.xml b/features/parent/odlparent-lite/pom.xml
new file mode 100644
index 0000000..82b2c68
--- /dev/null
+++ b/features/parent/odlparent-lite/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+################################################################################
+# Copyright 2019 highstreet technologies and others
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>odlparent-lite</artifactId>
+    <version>1.5.2</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.o-ran-sc.oam.features.parent</groupId>
+  <artifactId>odlparent-lite</artifactId>
+  <version>0.7.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>o-ran-sc features odlparent-lite</name>
+
+  <repositories>
+    <repository>
+      <id>onap-public</id>
+      <url>https://nexus.onap.org/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>onap-staging</id>
+      <url>https://nexus.onap.org/content/groups/staging/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>ecomp-release</id>
+      <name>onap-repository-releases</name>
+      <url>https://nexus.onap.org/content/repositories/releases/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>ecomp-snapshot</id>
+      <name>onap-repository-snapshots</name>
+      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+</project>
diff --git a/features/parent/single-feature-parent/pom.xml b/features/parent/single-feature-parent/pom.xml
new file mode 100644
index 0000000..8153ed4
--- /dev/null
+++ b/features/parent/single-feature-parent/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+################################################################################
+# Copyright 2019 highstreet technologies and others
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.ccsdk.parent</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.5.2</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.o-ran-sc.oam.features.parent</groupId>
+  <artifactId>single-feature-parent</artifactId>
+  <version>0.7.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <name>o-ran-sc features single-feature-parent</name>
+
+  <repositories>
+    <repository>
+      <id>onap-public</id>
+      <url>https://nexus.onap.org/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>onap-staging</id>
+      <url>https://nexus.onap.org/content/groups/staging/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>ecomp-release</id>
+      <name>onap-repository-releases</name>
+      <url>https://nexus.onap.org/content/repositories/releases/</url>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>ecomp-snapshot</id>
+      <name>onap-repository-snapshots</name>
+      <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+</project>
diff --git a/features/pom.xml b/features/pom.xml
index e987ce6..414a015 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -19,13 +19,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.5.2</version>
-    <relativePath />
-  </parent>
-
   <groupId>org.o-ran-sc.oam.features</groupId>
   <artifactId>features-top</artifactId>
   <version>0.7.1-SNAPSHOT</version>
@@ -34,9 +27,11 @@
   <name>o-ran-sc features</name>
 
   <modules>
+    <module>parent/binding-parent</module>
+    <module>parent/odlparent-lite</module>
+    <module>parent/single-feature-parent</module>
     <module>devicemanager/o-ran/ru-fh</module>
     <module>devicemanager/x-ran/ru-fh</module>
-    <module>devicemanager/3gpp/common</module>
   </modules>
 
 </project>
diff --git a/features/settings.onap.xml b/features/settings.onap.xml
deleted file mode 100644
index 0f3a0e0..0000000
--- a/features/settings.onap.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright (c) 2016-2018 Huawei Technologies Co., Ltd. and others.  All rights reserved.
-   Modifications Copyright (c) 2020 AT&T Technologies.  All rights reserved.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-  <profiles>
-    <profile>
-      <id>onap-settings</id>
-      <properties>
-        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-        <onap.nexus.rawrepo.baseurl.upload>https://nexus.onap.org/content/sites/raw</onap.nexus.rawrepo.baseurl.upload>
-        <onap.nexus.rawrepo.baseurl.download>https://nexus.onap.org/service/local/repositories/raw/content</onap.nexus.rawrepo.baseurl.download>
-        <onap.nexus.rawrepo.serverid>ecomp-raw</onap.nexus.rawrepo.serverid>
-
-        <!-- properties for Nexus Docker registry -->
-        <onap.nexus.dockerregistry.daily>nexus3.onap.org:10003</onap.nexus.dockerregistry.daily>
-        <onap.nexus.dockerregistry.release>nexus3.onap.org:10002</onap.nexus.dockerregistry.release>
-        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
-        <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
-      </properties>
-    </profile>
-    <profile>
-      <id>onap-snapshots</id>
-      <repositories>
-        <repository>
-          <id>onap-snapshots</id>
-          <name>onap-snapshots</name>
-          <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>onap-snapshots</id>
-          <name>onap-snapshots</name>
-          <url>https://nexus.onap.org/content/repositories/snapshots/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-    <profile>
-      <id>onap-releases</id>
-      <repositories>
-        <repository>
-          <id>onap-releases</id>
-          <name>onap-releases</name>
-          <url>https://nexus.onap.org/content/repositories/releases/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>onap-releases</id>
-          <name>onap-releases</name>
-          <url>https://nexus.onap.org/content/repositories/releases/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-    <profile>
-      <id>onap-public</id>
-      <repositories>
-        <repository>
-          <id>central</id>
-          <url>https://repo1.maven.org/maven2/</url>
-        </repository>
-        <repository>
-          <id>onap-public</id>
-          <name>onap-public</name>
-          <url>https://nexus.onap.org/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>central</id>
-          <url>https://repo1.maven.org/maven2/</url>
-        </pluginRepository>
-        <pluginRepository>
-          <id>onap-public</id>
-          <name>onap-public</name>
-          <url>https://nexus.onap.org/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-    <profile>
-      <!-- Configure this profile if you have a local nexus cache -->
-      <id>local-public</id>
-      <repositories>
-        <repository>
-          <id>local-public</id>
-          <name>local-public</name>
-          <url>http://nexus-proxy:8081/nexus/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>local-public</id>
-          <name>local-public</name>
-          <url>http://nexus-proxy:8081/nexus/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>onap-settings</activeProfile>
-    <activeProfile>onap-snapshots</activeProfile>
-    <activeProfile>onap-releases</activeProfile>
-    <activeProfile>onap-public</activeProfile>
-    <!-- <activeProfile>local-public</activeProfile> -->
-  </activeProfiles>
-
-</settings>
-- 
2.16.6