Swap OF plugin in master distribution

Change-Id: I2e3b67840f6dad67f7d67baab7871ba00c0ff7e1
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 5adadfa25b07297da255b701ecf468a8ba650306..21af156b39f3301e277ab586e32553ebb835ee75 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -253,28 +253,28 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.netvirt</groupId>
-       <artifactId>features-netvirt</artifactId>
-       <version>${feature.netvirt.version}</version>
-       <classifier>features</classifier>
-       <type>xml</type>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.netvirt</groupId>
-       <artifactId>openstack.net-virt-sfc-features</artifactId>
-       <version>${feature.netvirt.version}</version>
-       <classifier>features</classifier>
-       <type>xml</type>
-     </dependency>
-     <dependency>
-       <groupId>org.opendaylight.netvirt</groupId>
-       <artifactId>vpnservice-features</artifactId>
-       <version>${feature.netvirt.vpnservice.version}</version>
-       <classifier>features</classifier>
-       <type>xml</type>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>features-netvirt</artifactId>
+      <version>${feature.netvirt.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>openstack.net-virt-sfc-features</artifactId>
+      <version>${feature.netvirt.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>vpnservice-features</artifactId>
+      <version>${feature.netvirt.vpnservice.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
      </dependency>
-     <dependency>
+    <dependency>
       <groupId>org.opendaylight.netide</groupId>
       <artifactId>netide-features</artifactId>
       <version>${feature.netide.version}</version>
@@ -325,13 +325,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-he</artifactId>
+      <version>${feature.openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin-extension</artifactId>
@@ -339,6 +339,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension-he</artifactId>
+      <version>${feature.openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>library-features</artifactId>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index d5cde535520625af0da6edcc75ffe7e68b0b21cd..72224c209b0327a0c650839c220474e32099685c 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -79,8 +79,9 @@
     -->
     <repository>mvn:org.opendaylight.ofextensions.circuitsw/circuitsw-features/${feature.circuitsw.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-he/${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/features-openflowplugin-extension-he/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/library-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/southbound-features/${feature.ovsdb.version}/xml/features</repository>