Apply multiple edits to remove Karaf 3

[integration/distribution.git] / features / repos / index / pom.xml

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index e85099b69483952114c6825d8de8d09bd578b163..6f10a3c00795ffaf896135e88abef0ec02309c9f 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -61,6 +61,8 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Offset 0 -->
+
         <!-- AAA -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
@@ -75,119 +77,132 @@
             <type>xml</type>
         </dependency>
 
-        <!-- BGPCEP -->
+        <!-- Controller -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgp</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features4-extras</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bmp</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features4-mdsal</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgpcep-extras</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>features4-mdsal-benchmark</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- InfraUtils -->
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-pcep</artifactId>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>infrautils-features4</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- FIXME: Add Mdsal -->
+
+        <!-- Netconf -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-rsvp</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features4-netconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <!-- Controller -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-extras</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features4-netconf-connector</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features4-restconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <!-- ODL Parent -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal-benchmark</artifactId>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features4-akka</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <!-- Dlux -->
         <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>features4-dlux</artifactId>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features4-odlparent</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
 
-        <!-- Dlux Apps -->
+        <!-- FIXME: Add Yangtools -->
+
+        <!-- Higher offsets, temporarily removed due to Bug 8625 -->
+
+        <!-- BGPCEP -->
+        <!--
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>features4-dluxapps</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-bgp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <!-- InfraUtils -->
         <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>infrautils-features4</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-bmp</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>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-bgpcep-extras</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-netconf-connector</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-pcep</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-restconf</artifactId>
+            <groupId>org.opendaylight.bgpcep</groupId>
+            <artifactId>features4-rsvp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
-        <!-- ODL Parent -->
+        <!-- Dlux -->
+        <!--
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-akka</artifactId>
+            <groupId>org.opendaylight.dlux</groupId>
+            <artifactId>features4-dlux</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
+
+        <!-- Dlux Apps -->
+        <!--
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-odlparent</artifactId>
+            <groupId>org.opendaylight.dluxapps</groupId>
+            <artifactId>features4-dluxapps</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- OpenFlow Plugin -->
+        <!--
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features4-openflowplugin</artifactId>
@@ -212,22 +227,27 @@
             <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>