X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=artifacts%2Fupstream%2Ffeature-repos%2Fpom.xml;h=465bbb02c6ea00fe619b1d90c03439f6ae7f85e6;hb=fa9f955ffdbef9b3e8c43cfa6d188c72a1eb999d;hp=06e9e44e15b29b769103b5b5d05c75c7e3e64d3f;hpb=4aad03972002ddb38d663648c64ff0ae7c3b2e2d;p=integration%2Fdistribution.git

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 06e9e44e..465bbb02 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -39,20 +39,21 @@
     </scm>
     <!-- TODO: Open Bugs against projects to export user-facing feature repository versions in artifact poms. -->
     <dependencyManagement>
-        <!-- User facing feature repositories. -->
         <dependencies>
 
+            <!-- User facing feature repositories. -->
+
             <!-- AAA -->
             <dependency>
                 <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa</artifactId>
+                <artifactId>features-aaa</artifactId>
                 <version>${aaa.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa-shiro</artifactId>
+                <artifactId>features-aaa-shiro</artifactId>
                 <version>${aaa.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
@@ -61,149 +62,104 @@
             <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-extras</artifactId>
+                <artifactId>features-extras</artifactId>
                 <version>${controller.extras.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal</artifactId>
+                <artifactId>features-mdsal</artifactId>
                 <version>${mdsal.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal-benchmark</artifactId>
+                <artifactId>features-mdsal-benchmark</artifactId>
                 <version>${benchmark.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
 
             <!-- Dlux -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
             <dependency>
                 <groupId>org.opendaylight.dlux</groupId>
-                <artifactId>features4-dlux</artifactId>
+                <artifactId>features-dlux</artifactId>
                 <version>${dlux.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
 
-            <!-- Dlux Apps -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
+            <!-- DluxApps -->
             <dependency>
                 <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>features4-dluxapps</artifactId>
+                <artifactId>features-dluxapps</artifactId>
                 <version>${dluxapps.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
 
             <!-- InfraUtils -->
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>infrautils-features4</artifactId>
+                <artifactId>infrautils-features</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>
+                <artifactId>features-akka</artifactId>
                 <version>${odlparent.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features4-odlparent</artifactId>
+                <artifactId>features-odlparent</artifactId>
                 <version>${odlparent.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
 
-            <!-- OpenFlow Plugin -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
+            <!-- SNMP4SDN -->
             <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>
+                <groupId>org.opendaylight.snmp4sdn</groupId>
+                <artifactId>features-snmp4sdn</artifactId>
+                <version>${snmp4sdn.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
+            <!-- SXP -->
             <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin-extension-he</artifactId>
-                <version>${openflowplugin.version}</version>
+                <groupId>org.opendaylight.sxp</groupId>
+                <artifactId>features-sxp</artifactId>
+                <version>${sxp.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
 
-            <!-- SNMP -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
+            <!-- TTP -->
             <dependency>
-                <groupId>org.opendaylight.snmp</groupId>
-                <artifactId>features4-snmp</artifactId>
-                <version>${snmp.version}</version>
+                <groupId>org.opendaylight.ttp</groupId>
+                <artifactId>features-ttp</artifactId>
+                <version>${ttp.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
 
-            <!-- SXP -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
+            <!-- VTN -->
             <dependency>
-                <groupId>org.opendaylight.sxp</groupId>
-                <artifactId>features4-sxp</artifactId>
-                <version>${sxp.version}</version>
+                <groupId>org.opendaylight.vtn</groupId>
+                <artifactId>features-vtn-manager</artifactId>
+                <version>${vtn-manager.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
 
         </dependencies>
     </dependencyManagement>