From: Robert Varga <robert.varga@pantheon.tech>
Date: Sun, 26 Apr 2020 19:37:09 +0000 (+0200)
Subject: Clean up features-config-netty
X-Git-Tag: v2.0.0~28
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=753874181ac2304fe74aa6d926ba13e0a600b38c

Clean up features-config-netty

This feature repository contains a single feature, odl-config-netty,
which really is a remnant of config subsystem.

It further attempts to unify configuration of various southbound
modules' use of Netty, which unfortunately does not work because
downstreams need have better control over verious aspects of Netty
configuration.

Furthermore not everyone is using this infrastructure, and even
then it is a bad idea, as it lowers the amount of isolation plugins
get.

Repurpose this feature repository as features-controller-experimental,
holding a single odl-controller-exp-netty-config feature. This
clearly indicates the amount of stability that can be expected
and the plan is to move downstreams away from this feature.

Change-Id: I2edb9da48795cf1ff7de68c943c1bf895f584577
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index d11ef7c5ec..2311567e42 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -53,6 +53,14 @@
             </dependency>
 
             <!-- Features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-controller-experimental</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <scope>runtime</scope>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-mdsal</artifactId>
@@ -406,7 +414,7 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-config-netty</artifactId>
+                <artifactId>odl-controller-exp-netty-config</artifactId>
                 <version>0.13.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
diff --git a/features/features-config-netty/pom.xml b/features/features-controller-experimental/pom.xml
similarity index 56%
rename from features/features-config-netty/pom.xml
rename to features/features-controller-experimental/pom.xml
index dbad156f97..0eeeafd6d4 100644
--- a/features/features-config-netty/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -17,18 +17,30 @@
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>features-config-netty</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
+    <artifactId>features-controller-experimental</artifactId>
+    <version>1.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>
+    <name>OpenDaylight :: Controller :: Experimental Features</name>
+    <description>Controller Experimental 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>
-            <artifactId>odl-config-netty</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-exp-netty-config</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/features/odl-config-netty/pom.xml b/features/odl-controller-exp-netty-config/pom.xml
similarity index 91%
rename from features/odl-config-netty/pom.xml
rename to features/odl-controller-exp-netty-config/pom.xml
index ece654dfc3..eaaf3d2198 100644
--- a/features/odl-config-netty/pom.xml
+++ b/features/odl-controller-exp-netty-config/pom.xml
@@ -17,11 +17,11 @@
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>odl-config-netty</artifactId>
+    <artifactId>odl-controller-exp-netty-config</artifactId>
     <version>0.13.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Config-Netty</name>
+    <name>OpenDaylight :: Controller :: Experimental :: Netty Configuration</name>
+    <description>Common configuration for Netty resources</description>
 
     <dependencies>
         <dependency>
@@ -57,5 +57,4 @@
             <artifactId>threadpool-config-impl</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/features/odl-config-netty/src/main/feature/feature.xml b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
similarity index 83%
rename from features/odl-config-netty/src/main/feature/feature.xml
rename to features/odl-controller-exp-netty-config/src/main/feature/feature.xml
index cebeab5dbe..c61f9fc3df 100644
--- a/features/odl-config-netty/src/main/feature/feature.xml
+++ b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
@@ -6,8 +6,8 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-config-netty">
-    <feature name="odl-config-netty">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odlodl-controller-exp-netty-config">
+    <feature name="odl-controller-exp-netty-config">
         <feature version="[7,8)">odl-netty-4</feature>
     </feature>
 </features>
diff --git a/features/odl-mdsal-broker-local/pom.xml b/features/odl-mdsal-broker-local/pom.xml
index db6e40e7b2..69eb8178ee 100644
--- a/features/odl-mdsal-broker-local/pom.xml
+++ b/features/odl-mdsal-broker-local/pom.xml
@@ -64,13 +64,6 @@
             <artifactId>mdsal-eos-dom-simple</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-netty</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-inmemory-datastore</artifactId>
diff --git a/features/odl-mdsal-broker/pom.xml b/features/odl-mdsal-broker/pom.xml
index 7b1bbf6ed9..d108423778 100644
--- a/features/odl-mdsal-broker/pom.xml
+++ b/features/odl-mdsal-broker/pom.xml
@@ -50,12 +50,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-netty</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
     </dependencies>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 29ae8cb22b..c64b2a563b 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,10 +29,15 @@
     <!-- Common infra to cut down definitions -->
     <module>single-feature-parent</module>
 
+    <!-- Experimental features -->
+    <module>features-controller-experimental</module>
+    <module>odl-controller-exp-netty-config</module>
+
+
+
     <!-- Single features, to be cleaned up -->
     <module>odl-benchmark-api</module>
     <module>odl-clustering-test-app</module>
-    <module>odl-config-netty</module>
     <module>odl-controller-blueprint</module>
     <module>odl-controller-mdsal-common</module>
     <module>odl-controller-model-topology</module>
@@ -50,7 +55,6 @@
     <module>odl-toaster</module>
 
     <!-- Repositories, to be cleaned up -->
-    <module>features-config-netty</module>
     <module>features-extras</module>
     <module>features-mdsal</module>
     <module>features-mdsal-benchmark</module>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 7598c8f484..beffc09253 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -20,6 +20,18 @@
   <version>1.15.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-parent</artifactId>
+        <version>1.12.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <!-- scope is compile so all features (there is only one) are installed
@@ -34,12 +46,18 @@
           Note: Nothing should go here that is not locked
           down with testing... ie, no broken feature repos
     -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-controller-experimental</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- MD-SAL Related Features -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>1.12.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -47,15 +65,14 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-extras</artifactId>
-      <version>${project.version}</version>
       <classifier>features</classifier>
+      <version>${project.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>6.0.0</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>