Apply multiple edits to remove Karaf 3

[integration/distribution.git] / features / singles / odl-integration-compatible-with-all / pom.xml

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 23ddd8eb35a841787b5e08d2a2a5128d4052b8c7..e69f10f2b48dd9f76edba6ce7e04efcbdaaa61df 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.8.0-Carbon</version>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -86,6 +86,7 @@
             <classifier>features</classifier>
         </dependency>
         -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>odl-bgpcep-pcep</artifactId>
@@ -98,14 +99,17 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- Dlux -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <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
@@ -124,28 +128,34 @@
         </dependency>
 
         <!-- OpenFlow Plugin -->
+        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
         <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=8625
         <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=8625
         <dependency>
             <groupId>org.opendaylight.sxp</groupId>
             <artifactId>odl-sxp-controller</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
     </dependencies>
 </project>