Merge "Remove opendaylight-karaf-empty from integration repo"

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 56685f3b0d0180a709695669465952f98638cfb2..312308ea1c4bdf1d5dae435dfec9643cc66330c2 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -170,6 +170,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+     <dependency>
+       <groupId>org.opendaylight.openflowplugin</groupId>
+       <artifactId>features-openflowplugin-li</artifactId>
+       <version>${feature.openflowplugin.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin-extension</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 1964049412c6e8aee09c29055528947347c5a58c..a7bc50d37413eec57f798f36b918e0f94e56cf60 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -51,6 +51,7 @@
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-li/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin.legacy/features-legacy/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>