bug 2493 - eliminate the use of xtend and remove dependecies

[openflowplugin.git] / features / pom.xml

diff --git a/features/pom.xml b/features/pom.xml
index 482fa36885d6c62f90b10ab26121776feaa9c9e3..1153af3c4fdd5dd15ce17e97776fe8c133f70674 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>
@@ -72,6 +71,45 @@
       <artifactId>openflowplugin</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>table-miss-enforcer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>table-miss-enforcer</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+
+      <dependency>
+          <groupId>org.opendaylight.openflowplugin.applications</groupId>
+          <artifactId>of-switch-config-pusher</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+          <groupId>org.opendaylight.openflowplugin.applications</groupId>
+          <artifactId>of-switch-config-pusher</artifactId>
+          <version>${project.version}</version>
+          <type>xml</type>
+          <classifier>config</classifier>
+      </dependency>
+
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>lldp-speaker</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.applications</groupId>
+      <artifactId>lldp-speaker</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
+
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <artifactId>drop-test-karaf</artifactId>
@@ -101,7 +139,7 @@
       <artifactId>liblldp</artifactId>
       <version>${sal.api.version}</version>
     </dependency>
-    
+
     <!-- test the features.xml -->
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>