From 0649333ae5bf0ebd5ef6fda62da7fa461255c699 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 12 May 2017 18:15:29 -0700
Subject: [PATCH] Add k4 progress from Carbon to Nitrogen

Change-Id: Ia41f58e5b7aadbeefa6cb52860fffcc76f81ac14
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/upstream/artifacts/pom.xml          |  12 +-
 artifacts/upstream/feature-repos/pom.xml      | 132 ++++++++++++++++
 artifacts/upstream/single-features/pom.xml    |  58 +++++++
 features/repos/index/pom.xml                  | 149 +++++++++++++++++-
 .../pom.xml                                   |  74 ++++++++-
 5 files changed, 413 insertions(+), 12 deletions(-)

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 43495bc9..4f3edfa8 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -42,16 +42,16 @@
             <!-- Project artifact poms. -->
             <!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
             <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>${config.version}</version>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>bgpcep-artifacts</artifactId>
+                <version>${bgpcep.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.opendaylight.lispflowmapping</groupId>
-                <artifactId>lispflowmapping-artifacts</artifactId>
-                <version>${lispflowmapping.version}</version>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>${config.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index f4926107..55836f67 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -41,6 +41,73 @@
     <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>
@@ -63,6 +130,71 @@
                 <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>
+
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 0623b596..c59958f0 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -40,6 +40,8 @@
     <dependencyManagement>
         <dependencies>
             <!-- Non-user-facing single feature needed for Version. -->
+
+            <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>odl-config-persister</artifactId>
@@ -48,8 +50,36 @@
                 <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>
@@ -64,6 +94,34 @@
                 <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 8e5a9b70..d51e115c 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -52,18 +52,106 @@
     </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.lispflowmapping</groupId>
-            <artifactId>features4-lispflowmapping</artifactId>
+            <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>
@@ -84,5 +172,62 @@
             <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 -->
+        <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 -->
+        <dependency>
+            <groupId>org.opendaylight.snmp</groupId>
+            <artifactId>features4-snmp</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <!-- SXP -->
+        <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 329856d2..468924b8 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -52,21 +52,62 @@
     </dependencyManagement>
     <dependencies>
         <!-- External single feature dependencies. -->
+
+        <!-- Distribution -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-distribution-version</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <!-- Lispflowmapping -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8304
+
+        <!-- AAA -->
         <dependency>
-            <groupId>org.opendaylight.lispflowmapping</groupId>
-            <artifactId>odl-lispflowmapping-msmr</artifactId>
+            <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 -->
+        <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=7891
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
@@ -81,5 +122,30 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <!-- OpenFlow Plugin -->
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <!-- SNMP -->
+        <dependency>
+            <groupId>org.opendaylight.snmp</groupId>
+            <artifactId>odl-snmp-plugin</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <!-- SXP -->
+        <dependency>
+            <groupId>org.opendaylight.sxp</groupId>
+            <artifactId>odl-sxp-controller</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
     </dependencies>
 </project>
-- 
2.36.6