From da98824f2ef1eb37c0c1a4ab5ddab14d95a16ba6 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Thu, 18 May 2017 19:37:05 -0700
Subject: [PATCH] Remove K4 dependencies from distribution

Clean up distribution of Karaf 4 depedencies after decision of
shipping Carbon on Karaf 3.

Change-Id: I27a4695439fd3d8a1148c26bd0b3ea6ef5132f89
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/upstream/artifacts/pom.xml          |  11 +-
 artifacts/upstream/feature-repos/pom.xml      | 156 +--------------
 artifacts/upstream/single-features/pom.xml    |  71 -------
 features/repos/index/pom.xml                  | 183 ------------------
 .../pom.xml                                   | 105 ----------
 5 files changed, 3 insertions(+), 523 deletions(-)

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index a3ef0669..41378437 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -39,15 +39,6 @@
     </scm>
     <dependencyManagement>
         <dependencies>
-            <!-- Project artifact poms. -->
-            <!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>bgpcep-artifacts</artifactId>
-                <version>${bgpcep.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-artifacts</artifactId>
@@ -55,6 +46,8 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Project artifact poms. -->
+            <!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 4c3f3ae9..fd46892a 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -39,162 +39,8 @@
     </scm>
     <!-- TODO: Open Bugs against projects to export user-facing feature repository versions in artifact poms. -->
     <dependencyManagement>
-        <!-- User facing feature repositories. -->
         <dependencies>
-
-            <!-- AAA -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Controller -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-extras</artifactId>
-                <version>${controller.extras.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal-benchmark</artifactId>
-                <version>${benchmark.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Dlux -->
-            <dependency>
-                <groupId>org.opendaylight.dlux</groupId>
-                <artifactId>features4-dlux</artifactId>
-                <version>${dlux.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Dlux Apps -->
-            <dependency>
-                <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>features4-dluxapps</artifactId>
-                <version>${dluxapps.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- InfraUtils -->
-            <dependency>
-                <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>infrautils-features4</artifactId>
-                <version>${infrautils.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Netconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features4-netconf</artifactId>
-                <version>${netconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features4-netconf-connector</artifactId>
-                <version>${netconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features4-restconf</artifactId>
-                <version>${restconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- ODL Parent -->
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features4-akka</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features4-odlparent</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- OpenFlow Plugin -->
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin-he</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin-extension</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin-extension-he</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- SNMP -->
-            <dependency>
-                <groupId>org.opendaylight.snmp</groupId>
-                <artifactId>features4-snmp</artifactId>
-                <version>${snmp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- SXP -->
-            <dependency>
-                <groupId>org.opendaylight.sxp</groupId>
-                <artifactId>features4-sxp</artifactId>
-                <version>${sxp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
+            <!-- User facing feature repositories. -->
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index adb8283e..fb246ba3 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -40,7 +40,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- Non-user-facing single feature needed for Version. -->
-
             <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -50,78 +49,8 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-
             <!-- User facing single features. -->
             <!-- TODO: Open Bugs against projects to export user-facing single feature versions in artifact pom. -->
-
-            <!-- AAA -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>odl-aaa-cert</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>odl-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Dlux -->
-            <dependency>
-                <groupId>org.opendaylight.dlux</groupId>
-                <artifactId>odl-dlux-core</artifactId>
-                <version>${dlux.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Netconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-netconf-mdsal</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-restconf</artifactId>
-                <version>${restconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- OpenFlow Plugin -->
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
-                <version>${openflowplugin.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
-            <!-- SNMP -->
-            <dependency>
-                <groupId>org.opendaylight.snmp</groupId>
-                <artifactId>odl-snmp-plugin</artifactId>
-                <version>${snmp.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
-            <!-- SXP -->
-            <dependency>
-                <groupId>org.opendaylight.sxp</groupId>
-                <artifactId>odl-sxp-controller</artifactId>
-                <version>${sxp.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index fdd1b103..0a8da573 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -52,188 +52,5 @@
     </dependencyManagement>
     <dependencies>
         <!-- FIXME: How to explain to feature-repo-parent it shall not list single features from repo dependencies? -->
-
-        <!-- Distribution -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>features-distribution</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- AAA -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features4-aaa</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features4-aaa-shiro</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- BGPCEP -->
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bmp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgpcep-extras</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-pcep</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-rsvp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- Controller -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-extras</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal-benchmark</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- Dlux -->
-        <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>features4-dlux</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- Dlux Apps -->
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>features4-dluxapps</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- InfraUtils -->
-        <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>infrautils-features4</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- Netconf -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-netconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-netconf-connector</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-restconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- ODL Parent -->
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-akka</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-odlparent</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- OpenFlow Plugin -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin-he</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin-extension</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin-extension-he</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- SNMP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.snmp</groupId>
-            <artifactId>features4-snmp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- SXP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.sxp</groupId>
-            <artifactId>features4-sxp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
     </dependencies>
 </project>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index db315270..6c2b5534 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -52,110 +52,5 @@
     </dependencyManagement>
     <dependencies>
         <!-- External single feature dependencies. -->
-
-        <!-- Distribution -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-distribution-version</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- AAA -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>odl-aaa-shiro</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- BGPCEP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8362
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bgp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8363
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bmp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-pcep</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-rsvp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- Dlux -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>odl-dlux-core</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- Netconf -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8357
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-mdsal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-restconf</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- OpenFlow Plugin -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- SNMP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.snmp</groupId>
-            <artifactId>odl-snmp-plugin</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- SXP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8378
-        <dependency>
-            <groupId>org.opendaylight.sxp</groupId>
-            <artifactId>odl-sxp-controller</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
     </dependencies>
 </project>
-- 
2.36.6