From 5903f865addbe711e9487541a0a8d9bdb3553e03 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 27 Apr 2020 10:41:26 +0200
Subject: [PATCH] Create features-controller

Squash features-mdsal and features-extras into a single production
features repository.

Change-Id: I76f3f8e575d9faa3979aeefa62d466d3c889dff3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             | 26 ++++++----
 .../pom.xml                                   | 52 +++++++++++--------
 features/features-extras/pom.xml              | 33 ------------
 features/pom.xml                              |  7 ++-
 karaf/pom.xml                                 | 12 +----
 opendaylight/md-sal/sal-binding-it/pom.xml    |  2 +-
 .../test/sal/binding/it/AbstractIT.java       |  2 +-
 .../md-sal/samples/toaster-it/pom.xml         |  2 +-
 .../sample/toaster/it/ToasterTest.java        |  2 +-
 9 files changed, 55 insertions(+), 83 deletions(-)
 rename features/{features-mdsal => features-controller}/pom.xml (66%)
 delete mode 100644 features/features-extras/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index c4c02cf0bb..f330890f8e 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -52,15 +52,6 @@
                 <scope>test</scope>
             </dependency>
 
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-mdsal</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-                <scope>runtime</scope>
-            </dependency>
-
             <!-- Base model augmentations -->
             <dependency>
                 <groupId>org.opendaylight.controller.model</groupId>
@@ -279,7 +270,15 @@
                 <classifier>datastore</classifier>
             </dependency>
 
-            <!-- Features -->
+            <!-- Production Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-broker</artifactId>
@@ -350,6 +349,13 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-jolokia</artifactId>
+                <version>1.15.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
 
             <!-- CSIT and other testing Features -->
             <dependency>
diff --git a/features/features-mdsal/pom.xml b/features/features-controller/pom.xml
similarity index 66%
rename from features/features-mdsal/pom.xml
rename to features/features-controller/pom.xml
index 638de15296..6f080f2ac8 100644
--- a/features/features-mdsal/pom.xml
+++ b/features/features-controller/pom.xml
@@ -17,78 +17,88 @@
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-mdsal</artifactId>
+    <artifactId>features-controller</artifactId>
     <version>1.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>
+    <name>OpenDaylight :: Controller :: Features</name>
+    <description>Controller Production Features</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>controller-artifacts</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker-local</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-clustering-commons</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-mdsal-common</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-distributed-datastore</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-model-inventory</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-model-topology</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-toaster</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-blueprint</artifactId>
-            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-jolokia</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/features-extras/pom.xml b/features/features-extras/pom.xml
deleted file mode 100644
index 208b18ce61..0000000000
--- a/features/features-extras/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<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.opendaylight.odlparent</groupId>
-        <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-extras</artifactId>
-    <version>1.15.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jolokia</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/pom.xml b/features/pom.xml
index 9205f35b92..4eee8850cb 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,6 +29,9 @@
     <!-- Common infra to cut down definitions -->
     <module>single-feature-parent</module>
 
+    <!-- Production features -->
+    <module>features-controller</module>
+
     <!-- Experimental features -->
     <module>features-controller-experimental</module>
     <module>odl-controller-exp-netty-config</module>
@@ -51,9 +54,5 @@
     <module>odl-mdsal-model-inventory</module>
     <module>odl-mdsal-remoterpc-connector</module>
     <module>odl-toaster</module>
-
-    <!-- Repositories, to be cleaned up -->
-    <module>features-extras</module>
-    <module>features-mdsal</module>
   </modules>
 </project>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index beffc09253..85d85b717c 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -53,20 +53,10 @@
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-
-    <!-- MD-SAL Related Features -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-extras</artifactId>
+      <artifactId>features-controller</artifactId>
       <classifier>features</classifier>
-      <version>${project.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
index 3485e54156..c64baf7d61 100644
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -12,7 +12,7 @@
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
+      <artifactId>features-controller</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java
index 3ecaf7eb91..60b4865ee2 100644
--- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java
+++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/AbstractIT.java
@@ -20,7 +20,7 @@ import org.ops4j.pax.exam.options.MavenUrlReference;
 public abstract class AbstractIT extends AbstractMdsalTestBase {
     @Override
     public MavenUrlReference getFeatureRepo() {
-        return maven().groupId("org.opendaylight.controller").artifactId("features-mdsal").classifier("features")
+        return maven().groupId("org.opendaylight.controller").artifactId("features-controller").classifier("features")
                 .type("xml").versionAsInProject();
     }
 
diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index 9655d34456..494fd84916 100644
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -13,7 +13,7 @@
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
+      <artifactId>features-controller</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
index 15beb2deab..bb0bdd9542 100644
--- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
@@ -34,7 +34,7 @@ public class ToasterTest extends AbstractMdsalTestBase {
 
     @Override
     public MavenUrlReference getFeatureRepo() {
-        return maven().groupId("org.opendaylight.controller").artifactId("features-mdsal").classifier("features")
+        return maven().groupId("org.opendaylight.controller").artifactId("features-controller").classifier("features")
                 .type("xml").versionAsInProject();
     }
 
-- 
2.36.6