Merge "Conductor to OFPManager dependency"

[openflowplugin.git] / features-li / pom.xml

diff --git a/features-li/pom.xml b/features-li/pom.xml
index e4c864cd90d8b265af5e49a03c036a0f5a3562c9..acfdf568d386aa3fa3768654247d3bf83c1e2486 100644 (file)
--- a/features-li/pom.xml
+++ b/features-li/pom.xml
@@ -5,28 +5,27 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-parent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>features-openflowplugin-li</artifactId>
     <packaging>jar</packaging>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <properties>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-        <config.version>0.4.0-SNAPSHOT</config.version>
-        <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
-        <openflowjava.version>0.7.0-SNAPSHOT</openflowjava.version>
-        <openflowplugin.version>0.2.0-SNAPSHOT</openflowplugin.version>
-        <dlux.version>0.3.0-SNAPSHOT</dlux.version>
-        <lldp.version>0.10.0-SNAPSHOT</lldp.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
+        <config.version>0.5.0-SNAPSHOT</config.version>
+        <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
+        <openflowjava.version>0.8.0-SNAPSHOT</openflowjava.version>
+        <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
+        <dlux.version>0.4.0-SNAPSHOT</dlux.version>
+        <lldp.version>0.11.0-SNAPSHOT</lldp.version>
 
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
-        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
+        <restconf.version>1.4.0-SNAPSHOT</restconf.version>
+        <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     </properties>
 
     <dependencyManagement>
@@ -149,9 +148,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>forwardingrules-manager-config</artifactId>
-            <classifier>config</classifier>
-            <type>xml</type>
+            <artifactId>forwardingrules-sync</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
@@ -166,10 +163,9 @@
             <artifactId>statistics-manager</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>statistics-manager-config</artifactId>
-            <classifier>config</classifier>
-            <type>xml</type>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
@@ -201,63 +197,26 @@
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>table-miss-enforcer</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>table-miss-enforcer</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>topology-lldp-discovery</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>topology-lldp-discovery</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>topology-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>topology-manager</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>of-switch-config-pusher</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>of-switch-config-pusher</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>lldp-speaker</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>drop-test-karaf</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>drop-test-karaf</artifactId>
-            <classifier>config</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>test-common</artifactId>
@@ -293,5 +252,15 @@
             <type>xml</type>
             <classifier>config</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>notification-supplier</artifactId>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>notification-supplier</artifactId>
+        </dependency>
     </dependencies>
 </project>