Merge "Technical Debt part 1"

[openflowplugin.git] / features / pom.xml

diff --git a/features/pom.xml b/features/pom.xml
index ec9c83585ac138eabaf3e8197da8c8b14e540196..e2eb7336e73d752cea3ca8113d4ca628f7fa83dc 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,29 +5,26 @@
     <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</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>
-        <config.inventory.manager.configfile>40-inventory-manager.xml</config.inventory.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>
@@ -151,20 +148,12 @@
         </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>
             <artifactId>inventory-manager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>inventory-manager</artifactId>
-            <type>xml</type>
-            <classifier>config</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>lldp-speaker</artifactId>
@@ -174,10 +163,16 @@
             <artifactId>statistics-manager</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>statistics-manager-config</artifactId>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <version>${project.version}</version>
+            <type>cfg</type>
             <classifier>config</classifier>
-            <type>xml</type>
         </dependency>
 
         <dependency>
@@ -209,62 +204,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>
@@ -273,7 +232,7 @@
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>openflowplugin-controller-config</artifactId>
             <type>xml</type>
-            <classifier>config-He</classifier>
+            <classifier>config-Li</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
@@ -296,16 +255,14 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
-            <artifactId>bulk-o-matic</artifactId>
+            <artifactId>notification-supplier</artifactId>
             <type>xml</type>
             <classifier>config</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin.applications</groupId>
+            <artifactId>notification-supplier</artifactId>
+        </dependency>
     </dependencies>
 
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    </scm>
 </project>