Remove of-config features from master distribution

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

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 2eb21f3f56d2070a0b89ce990968a5b4c1f17514..91ac1457ed50493eee0e8e85dc4ad5ae98a7a51d 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -112,8 +112,8 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal-benchmark</artifactId>
-      <version>${feature.benchmark.version}</version>
+      <artifactId>features-extras</artifactId>
+      <version>${feature.controller.extras.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -124,6 +124,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal-benchmark</artifactId>
+      <version>${feature.benchmark.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.didm</groupId>
       <artifactId>features-didm</artifactId>
@@ -250,6 +257,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+<!-- Issue with of-config merge requires this line commented out:
     <dependency>
       <groupId>org.opendaylight.of-config</groupId>
       <artifactId>features-of-config</artifactId>
@@ -257,6 +265,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+-->
     <dependency>
       <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
       <artifactId>circuitsw-features</artifactId>
@@ -348,7 +357,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!--
     <dependency>
       <groupId>org.opendaylight.snbi</groupId>
       <artifactId>features-snbi</artifactId>
@@ -356,7 +364,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
--->
     <dependency>
       <groupId>org.opendaylight.snmp</groupId>
       <artifactId>features-snmp</artifactId>