BUG-2780: Fix migrated sal-compatibility feature

 - odl-adsal-compatibility was replaced by odl-openflowplugin-adsal-compatibility

Change-Id: Idca5da7c31603c65332a02078f733cb7a429d286
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index f41a7a18e5032204c264d81a66c9a5dfebd767f4..4373b410b3e2255826d355902181970e574a9792 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -51,12 +51,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-nsf</artifactId>
@@ -104,6 +98,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.legacy</groupId>
+      <artifactId>features-legacy</artifactId>
+      <version>${feature.openflowplugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
       <artifactId>features-dlux</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 0a15af196bd043c555f323bc4111f190fe87935c..ffd45990accdbdb5b6fc4bec77ac41735dc453a7 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -37,7 +37,6 @@
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.5.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-netconf-connector/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${feature.nsf.version}/xml/features</repository>
@@ -46,8 +45,9 @@
     <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.controller/features-neutron/${feature.neutron.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.1.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${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>
     <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 066a52e45d0313b589f6b718efc05994cfd7f8e9..4dc9de784dd32ac32d8bc85cce4cc12d93e41bf4 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -63,7 +63,6 @@
         <feature version='0.2.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
         <feature version='0.2.0-SNAPSHOT'>odl-aaa-netconf-plugin</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
-        <feature version='${feature.adsal.version}'>odl-adsal-compatibility</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
@@ -74,9 +73,10 @@
         <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</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-flow-services</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
+        <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-adsal-compatibility</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>