Move Openflow NXM Extensions to its intended home: Openflowplugin

This change stops referring to nxm extensions at the temporary location
and move it to where it was always meant to be.

Related gerrits:
https://git.opendaylight.org/gerrit/#/c/10428/
https://git.opendaylight.org/gerrit/#/c/13234/
https://git.opendaylight.org/gerrit/#/c/14289/
https://git.opendaylight.org/gerrit/#/c/14316/

Patch 2: Use constant for the version of openflow plugin feature
Patch 3: Use constant for the version of openflow plugin feature (cont.)

Change-Id: I6a1e2d3c41fee31e864fb8be415506c62518e099
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 7fe5a167d607e25013fe1008b31ce96f91a591b2..eaa7b7d3d1b144bb3b17662c7d0aaa76ac412979 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -71,21 +71,21 @@
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>features-openflowplugin</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.dlux</groupId>
-      <artifactId>features-dlux</artifactId>
-      <version>${feature.dlux.version}</version>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension</artifactId>
+      <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-openflow-nxm</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>features-dlux</artifactId>
+      <version>${feature.dlux.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 9fa4e373ccb41feea9c67b11d816998b7e56df6a..1b6a3442afb15aada2f0d96a377fe5b82467fdfa 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -44,7 +44,7 @@
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.2.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.1.0-SNAPSHOT/xml/features</repository>
-    <repository>mvn:org.opendaylight.ovsdb/features-openflow-nxm/0.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.1.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 958884b38ec82e5f90b139749dc383d7bce28cd0..96fe1a012537cac45b8f2a0c3e01c03074441936 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -70,11 +70,11 @@
         <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>
         <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
-        <feature version='0.1.0-SNAPSHOT'>odl-openflow-nxm-extensions</feature>
         <feature version='0.6.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services-rest</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-openflowplugin-flow-services-ui</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-all</feature>
         <feature version="1.5.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>

diff --git a/pom.xml b/pom.xml
index a9fcb2a5294e73913bda8def71603f5307800cbe..d8fe0823ca479d92ee425ad96fe3f0488e3c9a87 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
     <feature.yangtools.version>0.7.0-SNAPSHOT</feature.yangtools.version>
     <feature.adsal.version>0.9.0-SNAPSHOT</feature.adsal.version>
     <feature.nsf.version>0.5.0-SNAPSHOT</feature.nsf.version>
+    <feature.openflowplugin.version>0.1.0-SNAPSHOT</feature.openflowplugin.version>
     <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
     <feature.ovsdb.openstack.version>1.1.0-SNAPSHOT</feature.ovsdb.openstack.version>
     <feature.groupbasedpolicy.version>0.2.0-SNAPSHOT</feature.groupbasedpolicy.version>