Replace odl-dlux-core with odl-dluxapps-topology

Due DLUX split, we removed odl-dlux-topology feature from odl-dlux-core.
Because your project have dependency on odl-dlux-core, i assume, you used
Topology app.

More info:
https://wiki.opendaylight.org/view/Weather#Rename_some_odl-dlux-.2A_features_to_odl-dluxapps-.2A

Change-Id: Idc542d3eacad5c18cc5ff749a2926cb415546ef4
Signed-off-by: Daniel Malachovsky <dmalacho@cisco.com>

diff --git a/features/pom.xml b/features/pom.xml
index 552de2dd95b26e46fcf225065b6420ff88258631..bb6691879d4ab87cb6cbff793f867d5e02b19b22 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,7 +18,7 @@
   <description> <!-- Provide a Description it will be visible in the shell CLI--> </description>
 
   <properties>
-    <dlux.version>0.5.0-SNAPSHOT</dlux.version>
+    <dluxapps.version>0.5.0-SNAPSHOT</dluxapps.version>
     <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
     <openflow.plugin.version>0.4.0-SNAPSHOT</openflow.plugin.version>
     <restconf.version>1.5.0-SNAPSHOT</restconf.version>
@@ -57,9 +57,9 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.dlux</groupId>
-      <artifactId>features-dlux</artifactId>
-      <version>${dlux.version}</version>
+      <groupId>org.opendaylight.dluxapps</groupId>
+      <artifactId>features-dluxapps</artifactId>
+      <version>${dluxapps.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 976c6346c759b1661e669b42aa7b5427893c9c62..31255a322998527040d15787f51062ab5f22bd6d 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -4,7 +4,7 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflow.plugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.dluxapps/features-dluxapps/${dluxapps.version}/xml/features</repository>
   <feature name='odl-l2switch-all' description="OpenDaylight :: L2Switch :: All" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-switch</feature>
   </feature>
@@ -21,7 +21,7 @@
     <feature version="${project.version}">odl-l2switch-switch-rest</feature>
     <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
     <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
-    <feature version="${dlux.version}">odl-dlux-core</feature>
+    <feature version="${dluxapps.version}">odl-dluxapps-topology</feature>
   </feature>
   <feature name='odl-l2switch-hosttracker' description="OpenDaylight :: L2Switch :: HostTracker" version='${project.version}'>
     <feature version="${project.version}">odl-l2switch-addresstracker</feature>