Switched back on dlux circular dependency for post-helium master

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

diff --git a/features/pom.xml b/features/pom.xml
index 482fa36885d6c62f90b10ab26121776feaa9c9e3..179d94c27daf1ea37fa1432263bc2698c72ea2d9 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -47,14 +47,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!-- TODO: temporary disabled during release process in order to avoid circular dependency to dlux -->
-    <!-- <dependency> -->
-    <!--   <groupId>org.opendaylight.dlux</groupId> -->
-    <!--   <artifactId>features-dlux</artifactId> -->
-    <!--   <version>${dlux.version}</version> -->
-    <!--   <classifier>features</classifier> -->
-    <!--   <type>xml</type> -->
-    <!-- </dependency> -->
+    <dependency>
+      <groupId>org.opendaylight.dlux</groupId>
+      <artifactId>features-dlux</artifactId>
+      <version>${dlux.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
 
     <!-- bundle dependencies -->
     <dependency>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 9a3d39bcf83a13428839b554d3e633ee5f511afd..999d8a75dbc324e8a886920843c57997286b812c 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -7,8 +7,7 @@
     <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-flow/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features</repository>
-    <!-- TODO: temporary disabled during release process in order to avoid circular dependency to dlux -->
-    <!-- <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository> -->
+    <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
 
     <feature name='odl-openflowplugin-all' description="OpenDaylight :: Openflow Plugin :: All" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-southbound</feature>
@@ -37,8 +36,7 @@
     </feature>
     <feature name='odl-openflowplugin-flow-services-ui' description="OpenDaylight :: Openflow Plugin :: Flow Services :: UI" version='${project.version}'>
         <feature version="${project.version}">odl-openflowplugin-flow-services-rest</feature>
-        <!-- TODO: temporary disabled during release process in order to avoid circular dependency to dlux -->
-        <!-- <feature version="${dlux.version}">odl-dlux-core</feature> -->
+        <feature version="${dlux.version}">odl-dlux-core</feature>
         <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
         <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
     </feature>