BUG-697: Bump versions for next stable release

Version two fixes TAG mismatch.

Resolve Bug:717 - Remove fragment version requirement from config-persister-*

Remove Fragment-Host version requirement, because it does not map well
with maven versioning.

Change-Id: I0e00d6e3a82790a2e7b0f5c9db3f8d4f1e24f7dd
Signed-off-by: Abhishek Kumar <abhishk2@cisco.com>
Signed-off-by: Surekha Bejgam <sbejgam@cisco.com>
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>

diff --git a/opendaylight/appauth/pom.xml b/opendaylight/appauth/pom.xml
index a2b066a3108da353cfd9b5ac7c57e78de58c2365..54e534da4a687d4139903508ee86055e1811a134 100644 (file)
--- a/opendaylight/appauth/pom.xml
+++ b/opendaylight/appauth/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
   <artifactId>appauth</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
     <build>

diff --git a/opendaylight/archetypes/odl-model-project/pom.xml b/opendaylight/archetypes/odl-model-project/pom.xml
index 63759c63dd4c913178826e112a6ee97602dd2cc0..16a20095678a197361082665e43c9f30ff932888 100644 (file)
--- a/opendaylight/archetypes/odl-model-project/pom.xml
+++ b/opendaylight/archetypes/odl-model-project/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>org.opendaylight.controller.archetypes</groupId>
   <artifactId>odl-model-project</artifactId>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.1-1-SNAPSHOT</version>
   <packaging>maven-archetype</packaging>
 
   <name>odl-model-project</name>

diff --git a/opendaylight/archetypes/pom.xml b/opendaylight/archetypes/pom.xml
index 7924ade6252795b803d1673c7a96c97e51e2d807..4739df12df432f5bf51086a403606e0f78ab987b 100644 (file)
--- a/opendaylight/archetypes/pom.xml
+++ b/opendaylight/archetypes/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.2-1-SNAPSHOT</version>
     <relativePath>../commons/parent</relativePath>
   </parent>
   <scm>

diff --git a/opendaylight/arphandler/pom.xml b/opendaylight/arphandler/pom.xml
index 569188e019f17f76f7ec3db8c738b84443560500..64b16287282ccf44731a91e6fc77622b14511d32 100644 (file)
--- a/opendaylight/arphandler/pom.xml
+++ b/opendaylight/arphandler/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
   <artifactId>arphandler</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/clustering/integrationtest/pom.xml b/opendaylight/clustering/integrationtest/pom.xml
index f53ca72486eb9f1c663b339be6fe7540e3d38bf4..d779b545941c3f1e0c2beaff0ecf3780ee0bda4b 100644 (file)
--- a/opendaylight/clustering/integrationtest/pom.xml
+++ b/opendaylight/clustering/integrationtest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>clustering.services.integrationtest</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/opendaylight/clustering/services/pom.xml b/opendaylight/clustering/services/pom.xml
index cd999d6019bcad888e76a86ba38585e8918d2bde..a10f50660701656541a05ebe95b34eaad73bd688 100644 (file)
--- a/opendaylight/clustering/services/pom.xml
+++ b/opendaylight/clustering/services/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>clustering.services</artifactId>
-  <version>0.5.0</version>
+  <version>0.5.1-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/clustering/services_implementation/pom.xml b/opendaylight/clustering/services_implementation/pom.xml
index 106577e7ef9f6fedb79f226cc2ae1fb9879d9488..451e23f24ef20cab3f2261c8eee7505c6e931e34 100644 (file)
--- a/opendaylight/clustering/services_implementation/pom.xml
+++ b/opendaylight/clustering/services_implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>clustering.services-implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <properties>
     <!-- Sonar properties using jacoco to retrieve integration test results -->

diff --git a/opendaylight/clustering/stub/pom.xml b/opendaylight/clustering/stub/pom.xml
index 2c3fc2427a3424d587f938c18a4ede99c38287cd..79b0bc90fa0e6c783211087c5eafc8f7afdc2b93 100644 (file)
--- a/opendaylight/clustering/stub/pom.xml
+++ b/opendaylight/clustering/stub/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>clustering.stub</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/clustering/test/pom.xml b/opendaylight/clustering/test/pom.xml
index 3d61ff62ab2effa782f52ff105c9354401c6a59e..03d634580ffc35102220319d0b2a0019b2c3d984 100644 (file)
--- a/opendaylight/clustering/test/pom.xml
+++ b/opendaylight/clustering/test/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>clustering.test</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/commons/checkstyle/pom.xml b/opendaylight/commons/checkstyle/pom.xml
index 9f49041fcff979a7488b76676a3905736f1ad3c8..451c81a07c3cda4b15e05ac9615c942ed89ea850 100644 (file)
--- a/opendaylight/commons/checkstyle/pom.xml
+++ b/opendaylight/commons/checkstyle/pom.xml
@@ -2,12 +2,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>checkstyle</artifactId>
-  <version>0.0.2</version>
+  <version>0.0.3-1-SNAPSHOT</version>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <properties>

diff --git a/opendaylight/commons/concepts/pom.xml b/opendaylight/commons/concepts/pom.xml
index bb41cdffbcd107e796f8a84a77200ad50741b91e..6ed70a762d61f420bd09be662f663b0748288ae7 100644 (file)
--- a/opendaylight/commons/concepts/pom.xml
+++ b/opendaylight/commons/concepts/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>concepts</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -42,7 +42,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.0.2</version>
+            <version>0.0.3-1-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <configuration>

diff --git a/opendaylight/commons/httpclient/pom.xml b/opendaylight/commons/httpclient/pom.xml
index b37900c288a4b40d6b6c59ac789bb465b05308bf..d3d73c47147e4a17c7137629bbcebe02da37f94e 100644 (file)
--- a/opendaylight/commons/httpclient/pom.xml
+++ b/opendaylight/commons/httpclient/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>commons.httpclient</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -59,7 +59,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.0.2</version>
+            <version>0.0.3-1-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <configuration>

diff --git a/opendaylight/commons/integrationtest/pom.xml b/opendaylight/commons/integrationtest/pom.xml
index 3b0fa44e8059b6f061956999a632ed512de470df..5d47814abca32e5809054d60f96edcad8e33d892 100644 (file)
--- a/opendaylight/commons/integrationtest/pom.xml
+++ b/opendaylight/commons/integrationtest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>commons.integrationtest</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencies>
@@ -112,7 +112,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.0.2</version>
+            <version>0.0.3-1-SNAPSHOT</version>
           </dependency>
          </dependencies>
         <configuration>

diff --git a/opendaylight/commons/logback_settings/pom.xml b/opendaylight/commons/logback_settings/pom.xml
index 61e9f13a1d2bd62bf1d7ce838532d72e8fc4359a..229982f9d2620d68e96ee7afd883f05dffb4e7a8 100644 (file)
--- a/opendaylight/commons/logback_settings/pom.xml
+++ b/opendaylight/commons/logback_settings/pom.xml
@@ -1,17 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons.logback_settings</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.2-1-SNAPSHOT</version>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-1-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 </project>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 2c71c40e3f1121a6aa4319cdc40da0ce61a69bb3..0f85dc33a5b991ccd74eaf7d6e229ca8704da0bb 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -6,19 +6,19 @@
   </prerequisites>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-1-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <properties>
@@ -71,38 +71,38 @@
     <junit.version>4.8.1</junit.version>
     <yangtools.version>0.6.1</yangtools.version>
     <!--versions for bits of the controller -->
-    <controller.version>0.4.1</controller.version>
-    <hosttracker.api.version>0.5.1</hosttracker.api.version>
-    <hosttracker_new.api.version>0.4.1</hosttracker_new.api.version>
-    <hosttracker.implementation.version>0.5.1</hosttracker.implementation.version>
-    <arphandler.version>0.5.1</arphandler.version>
-    <forwarding.staticrouting>0.5.1</forwarding.staticrouting>
-    <samples.loadbalancer>0.5.1</samples.loadbalancer>
-    <config.version>0.2.3</config.version>
-    <netconf.version>0.2.3</netconf.version>
-    <mdsal.version>1.0</mdsal.version>
-    <containermanager.version>0.5.1</containermanager.version>
-    <containermanager.it.version>0.5.1</containermanager.it.version>
-    <switchmanager.api.version>0.7.0</switchmanager.api.version>
-    <connectionmanager.version>0.1.1</connectionmanager.version>
-    <sal.version>0.7.0</sal.version>
-    <sal.networkconfiguration.version>0.0.2</sal.networkconfiguration.version>
-    <sal.connection.version>0.1.1</sal.connection.version>
-    <networkconfig.bridgedomain.northbound.version>0.0.2</networkconfig.bridgedomain.northbound.version>
-    <commons.httpclient.version>0.1.1</commons.httpclient.version>
-    <concepts.version>0.5.1</concepts.version>
-    <protocol-framework.version>0.4.0</protocol-framework.version>
+    <controller.version>0.4.2-1-SNAPSHOT</controller.version>
+    <hosttracker.api.version>0.5.2-1-SNAPSHOT</hosttracker.api.version>
+    <hosttracker_new.api.version>0.4.2-1-SNAPSHOT</hosttracker_new.api.version>
+    <hosttracker.implementation.version>0.5.2-1-SNAPSHOT</hosttracker.implementation.version>
+    <arphandler.version>0.5.2-1-SNAPSHOT</arphandler.version>
+    <forwarding.staticrouting>0.5.2-1-SNAPSHOT</forwarding.staticrouting>
+    <samples.loadbalancer>0.5.2-1-SNAPSHOT</samples.loadbalancer>
+    <config.version>0.2.4-1-SNAPSHOT</config.version>
+    <netconf.version>0.2.4-1-SNAPSHOT</netconf.version>
+    <mdsal.version>1.1-1-SNAPSHOT</mdsal.version>
+    <containermanager.version>0.5.2-1-SNAPSHOT</containermanager.version>
+    <containermanager.it.version>0.5.2-1-SNAPSHOT</containermanager.it.version>
+    <switchmanager.api.version>0.7.1-1-SNAPSHOT</switchmanager.api.version>
+    <connectionmanager.version>0.1.2-1-SNAPSHOT</connectionmanager.version>
+    <sal.version>0.7.1-1-SNAPSHOT</sal.version>
+    <sal.networkconfiguration.version>0.0.3-1-SNAPSHOT</sal.networkconfiguration.version>
+    <sal.connection.version>0.1.2-1-SNAPSHOT</sal.connection.version>
+    <networkconfig.bridgedomain.northbound.version>0.0.3-1-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
+    <commons.httpclient.version>0.1.2-1-SNAPSHOT</commons.httpclient.version>
+    <concepts.version>0.5.2-1-SNAPSHOT</concepts.version>
+    <protocol-framework.version>0.4.1-1-SNAPSHOT</protocol-framework.version>
     <netty.version>4.0.10.Final</netty.version>
     <commons.io.version>2.4</commons.io.version>
-    <bundlescanner.version>0.4.1</bundlescanner.version>
-    <usermanager.version>0.4.1</usermanager.version>
-    <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <statisticsmanager.version>0.5.0</statisticsmanager.version>
-    <clustering.services.version>0.5.0</clustering.services.version>
-    <configuration.version>0.4.1</configuration.version>
-    <topologymanager.version>0.4.1</topologymanager.version>
-    <protocol_plugin.stub.version>0.4.1</protocol_plugin.stub.version>
-    <clustering.stub.version>0.4.1</clustering.stub.version>
+    <bundlescanner.version>0.4.2-1-SNAPSHOT</bundlescanner.version>
+    <usermanager.version>0.4.2-1-SNAPSHOT</usermanager.version>
+    <forwardingrulesmanager.version>0.5.1-1-SNAPSHOT</forwardingrulesmanager.version>
+    <statisticsmanager.version>0.5.1-1-SNAPSHOT</statisticsmanager.version>
+    <clustering.services.version>0.5.1-1-SNAPSHOT</clustering.services.version>
+    <configuration.version>0.4.2-1-SNAPSHOT</configuration.version>
+    <topologymanager.version>0.4.2-1-SNAPSHOT</topologymanager.version>
+    <protocol_plugin.stub.version>0.4.2-1-SNAPSHOT</protocol_plugin.stub.version>
+    <clustering.stub.version>0.4.2-1-SNAPSHOT</clustering.stub.version>
     <!-- Third party version -->
     <jersey-servlet.version>1.17</jersey-servlet.version>
     <corsfilter.version>7.0.42</corsfilter.version>
@@ -645,7 +645,7 @@
       <dependency>
         <groupId>org.opendaylight.controller.thirdparty</groupId>
         <artifactId>ganymed</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -953,7 +953,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>osgi-brandfragment.web</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-1-SNAPSHOT</version>
       </dependency>
 
       <!--  Neutron -->
@@ -1037,12 +1037,12 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>httpservice-bridge</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>jolokia-bridge</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -1052,12 +1052,12 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>usermanager.northbound</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controllermanager.northbound</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-1-SNAPSHOT</version>
       </dependency>
       <!-- Debug and logging -->
       <dependency>
@@ -1134,7 +1134,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.logback_settings</artifactId>
-        <version>0.0.1</version>
+        <version>0.0.2-1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -1661,7 +1661,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>checkstyle</artifactId>
-            <version>0.0.2</version>
+            <version>0.0.3-1-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <executions>
@@ -1878,7 +1878,7 @@
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
               <artifactId>commons.logback_settings</artifactId>
-              <version>0.0.1</version>
+              <version>0.0.2-1-SNAPSHOT</version>
             </dependency>
           </dependencies>
         </plugin>

diff --git a/opendaylight/commons/parent/pom.xml b/opendaylight/commons/parent/pom.xml
index 0a3d8f60f6922c914eef1f089a43cbe9f46b86b7..bd40f104c8d66f715515fad39d8023029624636f 100644 (file)
--- a/opendaylight/commons/parent/pom.xml
+++ b/opendaylight/commons/parent/pom.xml
@@ -6,13 +6,13 @@
   </prerequisites>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.parent</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <properties>

diff --git a/opendaylight/commons/protocol-framework/pom.xml b/opendaylight/commons/protocol-framework/pom.xml
index ea370c72c1a348ea16b378152a5673b907419cd0..9ddf3b01510a0fe44972e7a22fd3439cc55e4764 100644 (file)
--- a/opendaylight/commons/protocol-framework/pom.xml
+++ b/opendaylight/commons/protocol-framework/pom.xml
@@ -6,18 +6,18 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2-1-SNAPSHOT</version>
         <relativePath>../../commons/opendaylight</relativePath>
     </parent>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-        <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+        <tag>stable/hydrogen</tag>
     </scm>
 
     <artifactId>protocol-framework</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1-1-SNAPSHOT</version>
     <description>Common protocol framework</description>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>

diff --git a/opendaylight/config/config-api/pom.xml b/opendaylight/config/config-api/pom.xml
index 97d266cda97089a4a9b12634f6daaba31596e671..284cebab593bfbcc3026b7b82b3db7ba82dcf9fa 100644 (file)
--- a/opendaylight/config/config-api/pom.xml
+++ b/opendaylight/config/config-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>config-api</artifactId>

diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml
index 9ebc6d5b1084b69542e8d527951f21bfbff82ec8..17b960a3c132b512466c8b2775cf75b1e84d60c3 100644 (file)
--- a/opendaylight/config/config-manager/pom.xml
+++ b/opendaylight/config/config-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-manager</artifactId>

diff --git a/opendaylight/config/config-persister-api/pom.xml b/opendaylight/config/config-persister-api/pom.xml
index 39533068359d1aa544933c23ac4d004afcc09390..24603fd9f37fb27e846d9bbb551b7bcb95ea507f 100644 (file)
--- a/opendaylight/config/config-persister-api/pom.xml
+++ b/opendaylight/config/config-persister-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-persister-api</artifactId>

diff --git a/opendaylight/config/config-persister-directory-adapter/pom.xml b/opendaylight/config/config-persister-directory-adapter/pom.xml
index 162962ad0c3f92137d025725e8a9474e1477c358..581a64a4f21985a129d1208dd7640afac176b4e4 100644 (file)
--- a/opendaylight/config/config-persister-directory-adapter/pom.xml
+++ b/opendaylight/config/config-persister-directory-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-persister-directory-adapter</artifactId>
@@ -50,30 +50,12 @@
 
     <build>
         <plugins>
-            <!-- workaround for creating version according to OSGi specification (major.minor.micro[.qualifier] -->
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                System.setProperty("osgiversion", "${project.version}".replace('-', '.'))
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Fragment-Host>${project.groupId}.config-persister-impl;bundle-version=${osgiversion}
+                        <Fragment-Host>${project.groupId}.config-persister-impl
                         </Fragment-Host>
                         <Provide-Capability>org.opendaylight.controller.config.persister.storage.adapter
                         </Provide-Capability>

diff --git a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml
index 7aa338580ab118b310f6b0bb39ba387b8708ae3b..18172b28b985434ce7eee0a52497d110a16839b1 100644 (file)
--- a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml
+++ b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-persister-directory-autodetect-adapter</artifactId>
@@ -60,31 +60,13 @@
     </dependencies>
 
     <build>
-        <plugins>
-            <!-- workaround for creating version according to OSGi specification (major.minor.micro[.qualifier] -->
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                System.setProperty("osgiversion", "${project.version}".replace('-', '.'))
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
+          <plugins>
+             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Fragment-Host>${project.groupId}.config-persister-impl;bundle-version=${osgiversion}
+                            <Fragment-Host>${project.groupId}.config-persister-impl
                         </Fragment-Host>
                         <Provide-Capability>org.opendaylight.controller.config.persister.storage.adapter
                         </Provide-Capability>

diff --git a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
index 8dfab7e968d5f017c124fe41320a3467ae6ba955..eafb2532f3ed00927f20a38301fbe40c81df2270 100644 (file)
--- a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
+++ b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-persister-directory-xml-adapter</artifactId>
@@ -65,30 +65,12 @@
 
     <build>
         <plugins>
-            <!-- workaround for creating version according to OSGi specification (major.minor.micro[.qualifier] -->
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                System.setProperty("osgiversion", "${project.version}".replace('-', '.'))
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Fragment-Host>${project.groupId}.config-persister-impl;bundle-version=${osgiversion}
+                        <Fragment-Host>${project.groupId}.config-persister-impl
                         </Fragment-Host>
                         <Provide-Capability>org.opendaylight.controller.config.persister.storage.adapter
                         </Provide-Capability>
@@ -114,5 +96,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

diff --git a/opendaylight/config/config-persister-file-adapter/pom.xml b/opendaylight/config/config-persister-file-adapter/pom.xml
index cda0549fa3e76bf50eccf9a0420c91b25b0f9c7a..f172755ecc23c533c60958e25390c1f283ffd9cc 100644 (file)
--- a/opendaylight/config/config-persister-file-adapter/pom.xml
+++ b/opendaylight/config/config-persister-file-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-persister-file-adapter</artifactId>
@@ -45,30 +45,12 @@
 
     <build>
         <plugins>
-            <!-- workaround for creating version according to OSGi specification (major.minor.micro[.qualifier] -->
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                System.setProperty("osgiversion", "${project.version}".replace('-', '.'))
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Fragment-Host>${project.groupId}.config-persister-impl;bundle-version=${osgiversion}
+                        <Fragment-Host>${project.groupId}.config-persister-impl
                         </Fragment-Host>
                         <Provide-Capability>org.opendaylight.controller.config.persister.storage.adapter
                         </Provide-Capability>

diff --git a/opendaylight/config/config-persister-file-xml-adapter/pom.xml b/opendaylight/config/config-persister-file-xml-adapter/pom.xml
index b2bd1a32cab4ec1cdc42f957bbf3503fd2d90063..4d3cf41230ef09be7306877dbf82e0fbd3746bda 100644 (file)
--- a/opendaylight/config/config-persister-file-xml-adapter/pom.xml
+++ b/opendaylight/config/config-persister-file-xml-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-persister-file-xml-adapter</artifactId>
@@ -54,33 +54,14 @@
 
     <build>
         <plugins>
-            <!-- workaround for creating version according to OSGi specification (major.minor.micro[.qualifier] -->
-            <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                System.setProperty("osgiversion", "${project.version}".replace('-', '.'))
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Fragment-Host>${project.groupId}.config-persister-impl;bundle-version=${osgiversion}
+                        <Fragment-Host>${project.groupId}.config-persister-impl
                         </Fragment-Host>
-                        <Provide-Capability>org.opendaylight.controller.config.persister.storage.adapter
-                        </Provide-Capability>
+                        <Provide-Capability>org.opendaylight.controller.config.persister.storage.adapter</Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/opendaylight/config/config-plugin-parent/pom.xml b/opendaylight/config/config-plugin-parent/pom.xml
index 024e56c0b536c1f2575d69765b01e84085ee2621..a81e7e6671cc4030e5698ecee4f0cc3b708cfee1 100644 (file)
--- a/opendaylight/config/config-plugin-parent/pom.xml
+++ b/opendaylight/config/config-plugin-parent/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-subsystem</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>config-plugin-parent</artifactId>
@@ -16,7 +16,7 @@
 
     <properties>
         <jmxGeneratorPath>${project.build.directory}/generated-sources/config</jmxGeneratorPath>
-        <config.version>0.2.3</config.version>
+        <config.version>0.2.4-1-SNAPSHOT</config.version>
     </properties>
 
     <build>

diff --git a/opendaylight/config/config-util/pom.xml b/opendaylight/config/config-util/pom.xml
index af77fa32ec6084cd20a3e924cd6e47eb3e34f558..3df147c3d3f798536db9c567575eb3436cd8e27c 100644 (file)
--- a/opendaylight/config/config-util/pom.xml
+++ b/opendaylight/config/config-util/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>config-util</artifactId>

diff --git a/opendaylight/config/logback-config/pom.xml b/opendaylight/config/logback-config/pom.xml
index aa630d8c673edc254a6de5c61e623bb37971152b..a368329b028afabf135ff82993fa8a8f4bbf75a9 100644 (file)
--- a/opendaylight/config/logback-config/pom.xml
+++ b/opendaylight/config/logback-config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
     </parent>
     <artifactId>logback-config</artifactId>

diff --git a/opendaylight/config/netty-config-api/pom.xml b/opendaylight/config/netty-config-api/pom.xml
index 8edb26b6fa2f648d81e50df6bd40b15e7dfe0b0e..95b277b6118bd1f5f4b21cc8b459a36029223188 100644 (file)
--- a/opendaylight/config/netty-config-api/pom.xml
+++ b/opendaylight/config/netty-config-api/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index 852b8c8c9911b16c790460c8fc2999d91a91de3c..321919d63721ebbf29fc0d44ee4b792537333efc 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index 85a26f1aac2d34cc3250484fc498ae64a8ade820..df6a7640bb98fc356cc63459964d57bb6801d7b3 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
     </parent>
 

diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index 74f4aa973999263ff4ca0308765d05d36d0703b8..342251f62ff12fbdb514ef841bd5ec7dde4d3e0b 100644 (file)
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 9d2a10165d5ea4436504fe25522846d09176af7c..fc3b08af68167071a987319b4e7aee3c34e6792f 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2-1-SNAPSHOT</version>
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 
 
-    <version>0.2.3</version>
+    <version>0.2.4-1-SNAPSHOT</version>
     <artifactId>config-subsystem</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
@@ -68,7 +68,7 @@
         <jacoco.version>0.6.2.201302030002</jacoco.version>
         <slf4j.version>1.7.2</slf4j.version>
         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
-        <config.version>0.2.3</config.version>
+        <config.version>0.2.4-1-SNAPSHOT</config.version>
     </properties>
 
     <dependencies>

diff --git a/opendaylight/config/shutdown-api/pom.xml b/opendaylight/config/shutdown-api/pom.xml
index edef3491c98bee6454db5fa7f3efb9e5cc5cdd4b..365765e4a7075b8ca8342284095d650c42089d97 100644 (file)
--- a/opendaylight/config/shutdown-api/pom.xml
+++ b/opendaylight/config/shutdown-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-plugin-parent</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/shutdown-impl/pom.xml b/opendaylight/config/shutdown-impl/pom.xml
index 3bfba04cb012f8f7ac969e9d7407b381b87e76f2..d9242fe110ce1fbeccbcc69d4caee98830bbaef5 100644 (file)
--- a/opendaylight/config/shutdown-impl/pom.xml
+++ b/opendaylight/config/shutdown-impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-plugin-parent</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml
index 481870310c23dcfcf9a718edc863e425b7717033..1ae0ddacf686c8439d6e20bee2ca38c5429e6f0d 100644 (file)
--- a/opendaylight/config/threadpool-config-api/pom.xml
+++ b/opendaylight/config/threadpool-config-api/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml
index 4a7f00ff64f375373834f038d5e729315a47b97b..e65d97a16a392f4e62300d5d67ac79be5871491d 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/pom.xml
+++ b/opendaylight/config/threadpool-config-impl/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/yang-jmx-generator-it/pom.xml b/opendaylight/config/yang-jmx-generator-it/pom.xml
index 060c98c0b6f694d317a5cb8a2b041795b3c23674..61e3b8404efaeccf78c29dccaae0651879261770 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-it/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>yang-jmx-generator-it</artifactId>

diff --git a/opendaylight/config/yang-jmx-generator-plugin/pom.xml b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
index 18ef61dfb00042d10eb3e511c94ddb4d265cc37a..c8bcfbb16ec35c25d38d7844c2bbd0b5ccd565e1 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/pom.xml
+++ b/opendaylight/config/yang-jmx-generator-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>yang-jmx-generator-plugin</artifactId>

diff --git a/opendaylight/config/yang-jmx-generator/pom.xml b/opendaylight/config/yang-jmx-generator/pom.xml
index f105bd088329d7a4d39d5f4f910a776d561e277d..ffd6a0df058249e5ad9591ad75f3171d383a25b4 100644 (file)
--- a/opendaylight/config/yang-jmx-generator/pom.xml
+++ b/opendaylight/config/yang-jmx-generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>yang-jmx-generator</artifactId>

diff --git a/opendaylight/config/yang-store-api/pom.xml b/opendaylight/config/yang-store-api/pom.xml
index c7471bbae12488dc85dc8dc9139f8e75e2291641..194805c8ab72a15934b596d088777b8873f43d0f 100644 (file)
--- a/opendaylight/config/yang-store-api/pom.xml
+++ b/opendaylight/config/yang-store-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>yang-store-api</artifactId>

diff --git a/opendaylight/config/yang-store-impl/pom.xml b/opendaylight/config/yang-store-impl/pom.xml
index 6ef17b97a984e13e6bfce4547ece8e06506d5686..efce86f8af54df5990a06ca21661067bd1a215ff 100644 (file)
--- a/opendaylight/config/yang-store-impl/pom.xml
+++ b/opendaylight/config/yang-store-impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>yang-store-impl</artifactId>

diff --git a/opendaylight/config/yang-test-plugin/pom.xml b/opendaylight/config/yang-test-plugin/pom.xml
index cde1e5041ac2615f99d854f60745a54422c5815f..6f3769dd04e593c38097268b6c0368c9d967e1e0 100644 (file)
--- a/opendaylight/config/yang-test-plugin/pom.xml
+++ b/opendaylight/config/yang-test-plugin/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index 7d840bdadb7c49af82ec4f6369d8e023050d71e5..1577940bcb3343059b5b42511ff999f40e6edcd0 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-plugin-parent</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../config-plugin-parent</relativePath>
     </parent>
 

diff --git a/opendaylight/configuration/api/pom.xml b/opendaylight/configuration/api/pom.xml
index 8e45b42316a60f7e1c2a7ca49c5346651ebddc1b..ac00c2ee30fcc2e91fcab9a64701df36c0dd4739 100644 (file)
--- a/opendaylight/configuration/api/pom.xml
+++ b/opendaylight/configuration/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>configuration</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/configuration/implementation/pom.xml b/opendaylight/configuration/implementation/pom.xml
index c94b8b8b58ec1378ea471bdd080889b7bf6f35ce..74542463a1465a8221daefe50c689dad6164d435 100644 (file)
--- a/opendaylight/configuration/implementation/pom.xml
+++ b/opendaylight/configuration/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>configuration.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -55,6 +55,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/configuration/integrationtest/pom.xml b/opendaylight/configuration/integrationtest/pom.xml
index 390976f64620780e1f779542b50c32a3f95bf16d..00b07aa7017b98bbb65a906d07023c987527dd9e 100644 (file)
--- a/opendaylight/configuration/integrationtest/pom.xml
+++ b/opendaylight/configuration/integrationtest/pom.xml
@@ -4,18 +4,18 @@
 <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>configuration.integrationtest</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
    <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/connectionmanager/api/pom.xml b/opendaylight/connectionmanager/api/pom.xml
index a2916773b7e5f3232c6422354d5be4c360778dec..cdd4f83902df45f706393e6ef503d46ea3ac415d 100644 (file)
--- a/opendaylight/connectionmanager/api/pom.xml
+++ b/opendaylight/connectionmanager/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>connectionmanager</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/connectionmanager/implementation/pom.xml b/opendaylight/connectionmanager/implementation/pom.xml
index c5c7e7c6aaa5106231766bf17ad05945acdea3ed..9fd04b2dcab6a5ac82671d25b37cad7cc39718a2 100644 (file)
--- a/opendaylight/connectionmanager/implementation/pom.xml
+++ b/opendaylight/connectionmanager/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>connectionmanager.implementation</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -54,22 +54,22 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services</artifactId>
-      <version>0.5.0</version>
+      <version>0.5.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>connectionmanager</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>0.7.0</version>
+      <version>0.7.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal.connection</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>equinoxSDK381</groupId>

diff --git a/opendaylight/containermanager/api/pom.xml b/opendaylight/containermanager/api/pom.xml
index 254163ff4974bbf0f49ee7dacfea3fb02514d357..d9e4710b7aff3b64b0c94ab93837aea867e16b62 100644 (file)
--- a/opendaylight/containermanager/api/pom.xml
+++ b/opendaylight/containermanager/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>containermanager</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/containermanager/implementation/pom.xml b/opendaylight/containermanager/implementation/pom.xml
index 54f93ad66d1f1314e3b57e795a7ccbf2654118bd..ce322c59b4946b6b70c808e7df3cf55fe95a3802 100644 (file)
--- a/opendaylight/containermanager/implementation/pom.xml
+++ b/opendaylight/containermanager/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>containermanager.implementation</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/containermanager/it.implementation/pom.xml b/opendaylight/containermanager/it.implementation/pom.xml
index d63d66ad9080b77fd60a40b9b124509f5b0b6b60..80f11f0e5b63ee4a0631f94ec78f04104d094f0b 100644 (file)
--- a/opendaylight/containermanager/it.implementation/pom.xml
+++ b/opendaylight/containermanager/it.implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>containermanager.it.implementation</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 42b8b64ebb75b78a88fa0b48f3a04373b96f0813..e15abf8217d5e0086c65710fb40c6f21fc7cc235 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -8,12 +8,12 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-topology</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
          <groupId>org.opendaylight.yangtools.model</groupId>
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller.md</groupId>
@@ -551,12 +551,17 @@
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sanitytest</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-persister-impl</artifactId>
+          <version>${netconf.version}</version>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>
 
   <artifactId>distribution.opendaylight</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencies>

diff --git a/opendaylight/distribution/p2site/pom.xml b/opendaylight/distribution/p2site/pom.xml
index 78661d8df29e900b06c1f3bcb8cb8ba82ffdc437..489487d83d73365a52401abf8f45a3af60fabb50 100644 (file)
--- a/opendaylight/distribution/p2site/pom.xml
+++ b/opendaylight/distribution/p2site/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>

diff --git a/opendaylight/distribution/sanitytest/pom.xml b/opendaylight/distribution/sanitytest/pom.xml
index 9ed9a107380bde7d41e7bced6d12503129bf52bb..c9305a798cca78bb112f8676f0ca5623a0b846b7 100644 (file)
--- a/opendaylight/distribution/sanitytest/pom.xml
+++ b/opendaylight/distribution/sanitytest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>sanitytest</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <dependencies>
     <dependency>

diff --git a/opendaylight/forwarding/staticrouting/pom.xml b/opendaylight/forwarding/staticrouting/pom.xml
index 91d95c9d350cf53ccc9dca5070907f39bfe94f6e..ac28397494387464f85ea542e9180760a122af1a 100644 (file)
--- a/opendaylight/forwarding/staticrouting/pom.xml
+++ b/opendaylight/forwarding/staticrouting/pom.xml
@@ -4,18 +4,18 @@
  <parent>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-1-SNAPSHOT</version>
   <relativePath>../../commons/opendaylight</relativePath>
  </parent>
  <scm>
   <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
   <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
   <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-  <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+  <tag>stable/hydrogen</tag>
  </scm>
 
  <artifactId>forwarding.staticrouting</artifactId>
- <version>0.5.1</version>
+ <version>0.5.2-1-SNAPSHOT</version>
  <packaging>bundle</packaging>
 
  <build>
@@ -66,6 +66,7 @@
   <dependency>
    <groupId>org.opendaylight.controller</groupId>
    <artifactId>configuration</artifactId>
+   <version>${configuration.version}</version>
   </dependency>
   <dependency>
    <groupId>junit</groupId>

diff --git a/opendaylight/forwardingrulesmanager/api/pom.xml b/opendaylight/forwardingrulesmanager/api/pom.xml
index 4f026f3032e975b35ae32f2420ed53339baa1b9d..e0b93e06455ebccbbe0e38176110e3aeae561531 100644 (file)
--- a/opendaylight/forwardingrulesmanager/api/pom.xml
+++ b/opendaylight/forwardingrulesmanager/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>forwardingrulesmanager</artifactId>
-  <version>0.5.0</version>
+  <version>0.5.1-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -65,6 +65,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml
index 8b971a483efb4b5cb48e8805fe1d3c9cfbe6ffd1..eb892d616bdc9d166d6c744c42b8e44d2c84d623 100644 (file)
--- a/opendaylight/forwardingrulesmanager/implementation/pom.xml
+++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>forwardingrulesmanager.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -72,12 +72,12 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
-      <version>0.4.1</version>
+      <version>0.4.2-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services</artifactId>
-      <version>0.5.0</version>
+      <version>0.5.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -86,17 +86,17 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>0.7.0</version>
+      <version>0.7.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal.connection</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>forwardingrulesmanager</artifactId>
-      <version>0.5.0</version>
+      <version>0.5.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>equinoxSDK381</groupId>
@@ -105,12 +105,12 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>connectionmanager</artifactId>
-      <version>0.1.1</version>
+      <version>0.1.2-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>containermanager</artifactId>
-      <version>0.5.1</version>
+      <version>0.5.2-1-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
index 438c3ad93f712ec8bf858914003c290d1ac76874..cabdaac7c2aabe68fda2f3518994e3698d687216 100644 (file)
--- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
+++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>forwardingrulesmanager.integrationtest</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/opendaylight/hosttracker/api/pom.xml b/opendaylight/hosttracker/api/pom.xml
index 64aeacb9c270378cb32c83691e3e9ebbf23abf20..1c20320825947b343b6b42e0a4867d48edcb6683 100644 (file)
--- a/opendaylight/hosttracker/api/pom.xml
+++ b/opendaylight/hosttracker/api/pom.xml
@@ -4,17 +4,17 @@
  <parent>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-1-SNAPSHOT</version>
   <relativePath>../../commons/opendaylight</relativePath>
  </parent>
  <scm>
   <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
   <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
   <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-  <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+  <tag>stable/hydrogen</tag>
  </scm>
  <artifactId>hosttracker</artifactId>
- <version>0.5.1</version>
+ <version>0.5.2-1-SNAPSHOT</version>
  <packaging>bundle</packaging>
 
  <build>

diff --git a/opendaylight/hosttracker/implementation/pom.xml b/opendaylight/hosttracker/implementation/pom.xml
index b4849c9d9d4a61399e666ce54d6b1086042b962a..3314277300d52305ac3841813545956f72a50c94 100644 (file)
--- a/opendaylight/hosttracker/implementation/pom.xml
+++ b/opendaylight/hosttracker/implementation/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker.implementation</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <properties>

diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml
index 0e0938d4d4a6b8c0fd5add5b8bc3f118b75f356d..ad29853aa8af310194e21db53cb9bee5e057239e 100644 (file)
--- a/opendaylight/hosttracker/integrationtest/pom.xml
+++ b/opendaylight/hosttracker/integrationtest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>hosttracker.integrationtest</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/opendaylight/hosttracker_new/api/pom.xml b/opendaylight/hosttracker_new/api/pom.xml
index 9c0ae9ec77de08a387bae1b41433e63f80631a60..3d3cb9e5edae313bd97d2b57463096c71f120e3b 100644 (file)
--- a/opendaylight/hosttracker_new/api/pom.xml
+++ b/opendaylight/hosttracker_new/api/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker_new</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <build>

diff --git a/opendaylight/hosttracker_new/implementation/pom.xml b/opendaylight/hosttracker_new/implementation/pom.xml
index 782182dd04cafcfe0d109466d40bf3a2bcc2b947..794af7f8e56ef637b6fdc153089c1435fe84883b 100644 (file)
--- a/opendaylight/hosttracker_new/implementation/pom.xml
+++ b/opendaylight/hosttracker_new/implementation/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker_new.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <properties>

diff --git a/opendaylight/logging/bridge/pom.xml b/opendaylight/logging/bridge/pom.xml
index 3c98636842191a8fdd882762d57f497786d8f94b..1ad0062b9f8738a7c7f9825d26a210973d8ad9f6 100644 (file)
--- a/opendaylight/logging/bridge/pom.xml
+++ b/opendaylight/logging/bridge/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>logging.bridge</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencies>

diff --git a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
index c1e2fecedd2ca3daf1e5dac2722ec7649442e3cd..59cdedddcab970256212e6bedeedc6870084fb7e 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
+++ b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <scm>

diff --git a/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml b/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
index b4f71764d3e0804d6e12f22e737ae203ba0a8ddb..12c7e04cd2e332a41577b85ff51bd986509e805f 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
+++ b/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.integrationtest</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-1-SNAPSHOT<</version>
         <relativePath>../../../commons/integrationtest</relativePath>
     </parent>
     <scm>

diff --git a/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml b/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml
index 27efb66c7a301c855e266a2ceaed02d4747c5694..23efbd7024622605cf135a018c38f41c4be543be 100644 (file)
--- a/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml
+++ b/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml
@@ -3,7 +3,7 @@
   <parent>
      <groupId>org.opendaylight.controller</groupId>
     <artifactId>compatibility-parent</artifactId>
-    <version>1.0</version>
+    <version>1.1-1-SNAPSHOT</version>
   </parent>
   <artifactId>flow-management-compatibility</artifactId>
   <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <build>
@@ -40,12 +40,12 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-common-util</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -72,17 +72,17 @@
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-management</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>forwardingrulesmanager</artifactId>
-      <version>0.5.0</version>
+      <version>0.5.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-compatibility</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

diff --git a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml
index 4694c98c8085e2bc240544fb98e3320fa833967c..1cd069623859fba126c1d62c76d2c3b602ad42d7 100644 (file)
--- a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml
+++ b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>compatibility-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>inventory-topology-compatibility</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <build>
@@ -41,22 +41,22 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>switchmanager</artifactId>
-            <version>0.7.0</version>
+            <version>0.7.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>topologymanager</artifactId>
-            <version>0.4.1</version>
+            <version>0.4.2-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -83,27 +83,27 @@
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-management</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-topology</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>forwardingrulesmanager</artifactId>
-            <version>0.5.0</version>
+            <version>0.5.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-compatibility</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/md-sal/compatibility/pom.xml b/opendaylight/md-sal/compatibility/pom.xml
index 79958e09de1bf5dca1316bab61eb873c10374b40..ae93bf72b98dd375940ba36cae62cb1d234c34e4 100644 (file)
--- a/opendaylight/md-sal/compatibility/pom.xml
+++ b/opendaylight/md-sal/compatibility/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>compatibility-parent</artifactId>
     <packaging>pom</packaging>
@@ -12,7 +12,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modules>
@@ -25,22 +25,22 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.7.0</version>
+            <version>0.7.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml b/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml
index 1cb234f526dfd35224b2c0ad1dc561915978d7ca..de48da6cb9a1336ada539b847d03de49a954ad16 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>compatibility-parent</artifactId>
-    <version>1.0</version>
+    <version>1.1-1-SNAPSHOT</version>
   </parent>
   <artifactId>sal-compatibility</artifactId>
   <name>MD-SAL to AD-SAL Adaptation</name>
@@ -11,29 +11,29 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-statistics</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-topology</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-util</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>clustering.services</artifactId>
-        <version>0.5.0</version>
+        <version>0.5.1-1-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/forwardingrules-manager/pom.xml b/opendaylight/md-sal/forwardingrules-manager/pom.xml
index b025102e8caef74582e0391c8cfaad350d82719b..91827e6cd6d6597fd07e133b1b989680a6e9624a 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/pom.xml
+++ b/opendaylight/md-sal/forwardingrules-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
     <artifactId>forwardingrules-manager</artifactId>
@@ -13,7 +13,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
   
         <build>
@@ -46,22 +46,22 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>flow-management-compatibility</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-service</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller.model</groupId>
       <artifactId>model-flow-management</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/opendaylight/md-sal/inventory-manager/pom.xml b/opendaylight/md-sal/inventory-manager/pom.xml
index 2886ace13593f273ac682af9ea66bb67f7850c5f..39e313633605abb0910b9f3239c936a4f6367b86 100644 (file)
--- a/opendaylight/md-sal/inventory-manager/pom.xml
+++ b/opendaylight/md-sal/inventory-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
     <artifactId>inventory-manager</artifactId>
@@ -12,7 +12,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
@@ -23,17 +23,17 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>

diff --git a/opendaylight/md-sal/model/model-flow-base/pom.xml b/opendaylight/md-sal/model/model-flow-base/pom.xml
index 99d9e882975f76eeb8cefe43d6a24853e772ecd3..b589c22de860ef1740d3679b624c162174427af1 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-base/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.controller.model</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/model/model-flow-management/pom.xml b/opendaylight/md-sal/model/model-flow-management/pom.xml
index f22f14065460cb15029438277c2b4bb8239cb016..8e3a33c16738a56dd7ee3bf0d7ae12ab5e9adff0 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-management/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.controller.model</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/model/model-flow-service/pom.xml b/opendaylight/md-sal/model/model-flow-service/pom.xml
index 44c62a188ed197f3e1e8210547cfa7a46015aef6..2abcfa7e0b5bdaec5467d1803527d56d2b991bea 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-service/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.controller.model</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/model/model-flow-statistics/pom.xml b/opendaylight/md-sal/model/model-flow-statistics/pom.xml
index 7e47c4f4f5a2edbd861d41ea4c3d4cd39a635e54..762aff632c16ae17b2127b6e8d7634d023552c0c 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/pom.xml
+++ b/opendaylight/md-sal/model/model-flow-statistics/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.controller.model</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/model/model-inventory/pom.xml b/opendaylight/md-sal/model/model-inventory/pom.xml
index dbc510174c9e47ce4a0f8d71dfce7ee3add0b83b..c26101cc06382fc69d1dcef838fb86b219f129f4 100644 (file)
--- a/opendaylight/md-sal/model/model-inventory/pom.xml
+++ b/opendaylight/md-sal/model/model-inventory/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.controller.model</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/model/model-topology/pom.xml b/opendaylight/md-sal/model/model-topology/pom.xml
index 67abf313d33b701e0b90ea8566963373d5cd12b4..d719fc91a7277f72cde0cd6e4e26507f2df4d5d9 100644 (file)
--- a/opendaylight/md-sal/model/model-topology/pom.xml
+++ b/opendaylight/md-sal/model/model-topology/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <artifactId>model-parent</artifactId>
         <groupId>org.opendaylight.controller.model</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>

diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml
index fc5b9613d53998c35159ba25b07eabb5c81924b3..7b3915ff77d6470df952825e9dbbc485fa3e79af 100644 (file)
--- a/opendaylight/md-sal/model/pom.xml
+++ b/opendaylight/md-sal/model/pom.xml
@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index bfdb912f11e435df81caa0f6d78f600786595948..73e3ea33c85b5ab082a62fa6d0a8ab0428189cbf 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -4,19 +4,19 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2-1-SNAPSHOT</version>
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.0</version>
+    <version>1.1-1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <modules>
@@ -133,7 +133,7 @@
         <sonar.branch>${user.name}-private-view</sonar.branch>
         <sonar.language>java</sonar.language>
         <exam.version>3.0.0</exam.version>
-        <sal.version>0.7.0</sal.version>
+        <sal.version>0.7.1-1-SNAPSHOT</sal.version>
     </properties>
 
     <pluginRepositories>

diff --git a/opendaylight/md-sal/remoterpc-routingtable/implementation/pom.xml b/opendaylight/md-sal/remoterpc-routingtable/implementation/pom.xml
index dedd318a0cf4b1e2cce4396d5b1874cc63548a74..4e7eb3fc44daca806d4036a957b6f1a36387ffc6 100644 (file)
--- a/opendaylight/md-sal/remoterpc-routingtable/implementation/pom.xml
+++ b/opendaylight/md-sal/remoterpc-routingtable/implementation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <scm>

diff --git a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml
index bdc4569f31ac6869276e1cc7075ba7ded3844fc6..7c5a4af4f98a3a94d20de97e5b2c2b33aac67a57 100644 (file)
--- a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml
+++ b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/integrationtest</relativePath>
   </parent>
   <scm>

diff --git a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml
index 1fd4b762c173089c720ddf3842ccc202faf5c91c..1a1833262698029ffb3c623d98c2e65eaf37f366 100644 (file)
--- a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml
+++ b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>sal-remoterpc-connector-test-parent</artifactId>
     <groupId>org.opendaylight.controller.tests</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-1-SNAPSHOT</version>
   </parent>
 
   <artifactId>remoterpc-routingtable-nb-it</artifactId>

diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml
index 0dc2bddfa90ecbabfdb568667d639d9e9fa8a856..6d248a99d665928ac624233be75971d364f66b0a 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/pom.xml
+++ b/opendaylight/md-sal/sal-binding-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-binding-api</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 83d49100b64d8fd091b922cfc13709e6f1b65dcb..c85897e3dab4d9a3641ebb57198c76e7c91d095f 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-binding-broker-impl</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <build>
@@ -51,7 +51,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>0.2.3</version>
+                        <version>0.2.4-1-SNAPSHOT</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -156,22 +156,22 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -209,12 +209,12 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-broker-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -234,7 +234,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-config</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -264,17 +264,17 @@
         <dependency>
                <groupId>org.opendaylight.controller.model</groupId>
                <artifactId>model-flow-base</artifactId>
-               <version>1.0</version>
+               <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
                <groupId>org.opendaylight.controller.model</groupId>
                <artifactId>model-flow-service</artifactId>
-               <version>1.0</version>
+               <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
                <groupId>org.opendaylight.controller.model</groupId>
                <artifactId>model-flow-statistics</artifactId>
-               <version>1.0</version>
+               <version>1.1-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
index 4ad7ffe57451baed9f3fd673d33871b94dfd7482..0eff0d4d085465c6383252fb710bbefc31336834 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-binding-config</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <build>
@@ -64,7 +64,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>0.2.3</version>
+                        <version>0.2.4-1-SNAPSHOT</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -100,12 +100,12 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
-            <version>0.2.3</version>
+            <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index 62419769d5a28f21d47104015f8ebca90baf8dc8..1100b0182dc3060508dda8066582a591c6d6cfeb 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-binding-dom-it</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
     <build>
         <plugins>
@@ -57,26 +57,26 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-management</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml
index 6f3a265097d2cb4c2b235b52c7c5c0766625be75..d2171b52886f48ba12edc27cab0390ef5f7f525f 100644 (file)
--- a/opendaylight/md-sal/sal-binding-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-it/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <artifactId>sal-parent</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-binding-it</artifactId>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <properties>
@@ -19,8 +19,8 @@
         <!-- Sonar jacoco plugin to get integration test coverage info -->
         <sonar.jacoco.reportPath>../sal-binding-broker/target/jacoco.exec</sonar.jacoco.reportPath>
         <sonar.jacoco.itReportPath>../sal-binding-broker/target/jacoco-it.exec</sonar.jacoco.itReportPath>
-        <netconf.version>0.2.3</netconf.version>
-        <config.version>0.2.3</config.version>
+        <netconf.version>0.2.4-1-SNAPSHOT</netconf.version>
+        <config.version>0.2.4-1-SNAPSHOT</config.version>
         <moxy.controller.version>2.5.0</moxy.controller.version>
     </properties>
 
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -255,18 +255,18 @@
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-manager</artifactId>
-            <version>0.2.3</version>
+            <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-management</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/opendaylight/md-sal/sal-binding-spi/pom.xml b/opendaylight/md-sal/sal-binding-spi/pom.xml
index 22397a80b45271b5f2ddb3000bbe10be2c4f8368..0d552e651c54806bd08bf4c09fca9cc15b497616 100644 (file)
--- a/opendaylight/md-sal/sal-binding-spi/pom.xml
+++ b/opendaylight/md-sal/sal-binding-spi/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-binding-spi</artifactId>
     <scm>

diff --git a/opendaylight/md-sal/sal-binding-util/pom.xml b/opendaylight/md-sal/sal-binding-util/pom.xml
index 5dbb675a252114736a40dc15c60e267b09889760..b2f08899c5767aa2b9368b6bf402b05848ed5f91 100644 (file)
--- a/opendaylight/md-sal/sal-binding-util/pom.xml
+++ b/opendaylight/md-sal/sal-binding-util/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-binding-util</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml
index 83a46c09ec8e4e932c3eeb20c17735bae692c112..e980066027cc61eb0c516bdb866ed5964c34d84f 100644 (file)
--- a/opendaylight/md-sal/sal-common-api/pom.xml
+++ b/opendaylight/md-sal/sal-common-api/pom.xml
@@ -3,21 +3,21 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-common-api</artifactId>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml
index 88f9693825fa4a5bf878e2cbdfb687e48cd57daf..1e43a9a43e4e6640a5fa5f7c6a755363bd360b7a 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/pom.xml
+++ b/opendaylight/md-sal/sal-common-impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-common-impl</artifactId>
     <packaging>bundle</packaging>
@@ -11,19 +11,19 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml
index 0c014fb38a162dbce948ba199e092b882fee9176..08c1b6189e0185f20d62a9a47d9801e0b6dac016 100644 (file)
--- a/opendaylight/md-sal/sal-common-util/pom.xml
+++ b/opendaylight/md-sal/sal-common-util/pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.0</version>
+    <version>1.1-1-SNAPSHOT</version>
   </parent>
   <artifactId>sal-common-util</artifactId>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <dependencies>

diff --git a/opendaylight/md-sal/sal-common/pom.xml b/opendaylight/md-sal/sal-common/pom.xml
index b114c250551318b89012513065f8a95867958bd3..84961eb9faaf4644dd7b0ed4fc006f15254fe04d 100644 (file)
--- a/opendaylight/md-sal/sal-common/pom.xml
+++ b/opendaylight/md-sal/sal-common/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-common</artifactId>
     <scm>
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>

diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml
index 8b9d62f45d2db0603aa70f63af0d94d763366f4b..cb7545899ddc153187c7231b8594dce6500af9fc 100644 (file)
--- a/opendaylight/md-sal/sal-connector-api/pom.xml
+++ b/opendaylight/md-sal/sal-connector-api/pom.xml
@@ -3,21 +3,21 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-connector-api</artifactId>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/sal-data-api/pom.xml b/opendaylight/md-sal/sal-data-api/pom.xml
index 6b73e29e7dadd549efa5953602cc64f90275dcbf..a5c1bb9e7e258fa5efff2611b31167ab4ea3e429 100644 (file)
--- a/opendaylight/md-sal/sal-data-api/pom.xml
+++ b/opendaylight/md-sal/sal-data-api/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>sal-parent</artifactId>\r
-    <version>1.0-SNAPSHOT</version>\r
+    <version>1.1-1-SNAPSHOT</version>\r
   </parent>\r
    <artifactId>sal-data-api</artifactId>\r
    <scm>\r

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index a6f69fe69a678d4350eef84f70a4a6596f8a237f..91d0feecb73417117075577dc64c8693048eb6bf 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-core-api</artifactId>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
     <build>
         <plugins>
@@ -54,7 +54,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>0.2.3</version>
+                        <version>0.2.4-1-SNAPSHOT</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
@@ -89,13 +89,13 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
-            <version>0.2.3</version>
+            <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 963ba5f1ca17edb82961ae28d02d16edb5277af6..54e7e4d9f54e973ea90f1aeace21328f9254a3c7 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-broker-impl</artifactId>
     <packaging>bundle</packaging>
@@ -11,29 +11,29 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-spi</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
-            <version>0.2.3</version>
+            <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -99,7 +99,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>0.2.3</version>
+                        <version>0.2.4-1-SNAPSHOT</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/sal-dom-demo/pom.xml b/opendaylight/md-sal/sal-dom-demo/pom.xml
index 322bad787b3649597b40f75f15c99258a0e82b9d..e736babdac01fde44f502cc54b6aa90b4c7e90be 100644 (file)
--- a/opendaylight/md-sal/sal-dom-demo/pom.xml
+++ b/opendaylight/md-sal/sal-dom-demo/pom.xml
@@ -4,7 +4,7 @@
     <parent>\r
         <groupId>org.opendaylight.controller</groupId>\r
         <artifactId>sal-parent</artifactId>\r
-        <version>1.0-SNAPSHOT</version>\r
+        <version>1.1-1-SNAPSHOT</version>\r
     </parent>\r
     <artifactId>sal-core-demo</artifactId>\r
     <scm>\r

diff --git a/opendaylight/md-sal/sal-dom-it/pom.xml b/opendaylight/md-sal/sal-dom-it/pom.xml
index 5604a87552513de5a36d30bac46c98ba0d5b1546..4f1f89ce5b986c61965a6c9e2a7597c293a1633c 100644 (file)
--- a/opendaylight/md-sal/sal-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-dom-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-dom-it</artifactId>
     <scm>

diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml
index 989fe6f95ffd82ac31b25dd17245506f33278e81..4b896f3c64f3e2bff1451b1078554e87956b10f6 100644 (file)
--- a/opendaylight/md-sal/sal-dom-spi/pom.xml
+++ b/opendaylight/md-sal/sal-dom-spi/pom.xml
@@ -3,21 +3,21 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-core-spi</artifactId>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml
index 3988d10ad5d7a2244c727fc470ca12e774a68860..4b426a6b8be201dea0d08938825db1ef999d3dbc 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/pom.xml
+++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml
@@ -3,17 +3,17 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <properties>
-        <netconf.version>0.2.3</netconf.version>
+        <netconf.version>0.2.4-1-SNAPSHOT</netconf.version>
     </properties>
     <artifactId>sal-netconf-connector</artifactId>
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-threadgroup-config</artifactId>
-            <version>0.2.3</version>
+            <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-broker-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>test</scope>
             <type>jar</type>
         </dependency>
@@ -160,20 +160,20 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>sal-binding-broker-impl</artifactId>
-           <version>1.0</version>
+           <version>1.1-1-SNAPSHOT</version>
            <type>test-jar</type>
            <scope>test</scope>
         </dependency>
         <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>ietf-netconf-monitoring</artifactId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -183,12 +183,12 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>threadpool-config-api</artifactId>
-            <version>0.2.3</version>
+            <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-config-api</artifactId>
-            <version>0.2.3</version>
+            <version>0.2.4-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -242,7 +242,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-jmx-generator-plugin</artifactId>
-                        <version>0.2.3</version>
+                        <version>0.2.4-1-SNAPSHOT</version>
                     </dependency>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/sal-remote/pom.xml b/opendaylight/md-sal/sal-remote/pom.xml
index d8fd8e563e9effdfb40add063389b3e13480cbf0..8315d49423284d12abad70ac08e9b05fe9e4b1ea 100644 (file)
--- a/opendaylight/md-sal/sal-remote/pom.xml
+++ b/opendaylight/md-sal/sal-remote/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-remote</artifactId>
     <packaging>jar</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
     <build>
         <plugins>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
index 619b42be054d1637f00877b54525719e244a416b..aebc200ef7a487c8eded50dc65bcf00edd113a1e 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@ -6,7 +6,7 @@
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
         <relativePath>../..</relativePath>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>sal-remoterpc-connector</artifactId>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
index dd216c0881f1d09e0e6377830c5c9493abfd080b..9c8ffd0f6d2f60a447f860c32f6c79a71b3301db 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sal-remoterpc-connector-test-parent</artifactId>
         <groupId>org.opendaylight.controller.tests</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-remoterpc-connector-test-consumer</artifactId>
     <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/pom.xml
index 5bfbcba5f8522da0fed52b3c2f63d0f660499a80..63945b88ddf42f3fb6f94ceb1cd85a9904b76a8c 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-1-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   <packaging>pom</packaging>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml
index a13a5aeba08bfaa15f3ef8713ab0b93fdc411af6..291a85784bb79c2682262e5b4dc0802fc7e590ad 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml
@@ -4,7 +4,7 @@
   <parent>
         <artifactId>sal-remoterpc-connector-test-parent</artifactId>
         <groupId>org.opendaylight.controller.tests</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
   </parent>
   <artifactId>sal-remoterpc-connector-test-provider</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
index 8813ee9613448a49e66370e2d163d0e13115189a..4897fdd34ef846e757dba09b13c079077eaf2f7c 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sal-remoterpc-connector-test-parent</artifactId>
         <groupId>org.opendaylight.controller.tests</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-remoterpc-connector-test-it</artifactId>
     <scm>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml
index dc2fdbf9a05382d19307d6cccb20c918c6c1aafc..ef3b26377e17410657ebe1d73fb6b6171bb80835 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>sal-remoterpc-connector-test-parent</artifactId>
     <groupId>org.opendaylight.controller.tests</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-1-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-remoterpc-connector-test-nb</artifactId>

diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml
index 602dc89c515dbf959c644b8fa4cd7974a1d94102..1d502e4ffeba1271f58fb90d65f0914ddb59c8d5 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/pom.xml
+++ b/opendaylight/md-sal/sal-rest-connector/pom.xml
@@ -3,21 +3,21 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>sal-parent</artifactId>
-    <version>1.0</version>
+    <version>1.1-1-SNAPSHOT</version>
   </parent>
   <artifactId>sal-rest-connector</artifactId>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>sal-core-api</artifactId>
-      <version>1.0</version>
+      <version>1.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/opendaylight/md-sal/sal-restconf-broker/pom.xml b/opendaylight/md-sal/sal-restconf-broker/pom.xml
index 21957b5afbc5e52c43bd8f80326452fd7d1d1ea7..a5ded32015b4f4f83860eb8673e684038578310f 100644 (file)
--- a/opendaylight/md-sal/sal-restconf-broker/pom.xml
+++ b/opendaylight/md-sal/sal-restconf-broker/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-restconf-broker</artifactId>
     <packaging>jar</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
     <build>
         <plugins>
@@ -27,17 +27,17 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-remote</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/sal-schema-repository-api/pom.xml b/opendaylight/md-sal/sal-schema-repository-api/pom.xml
index a6e5c78628f467cbf396c885a22e445a9ece67b1..bf0f2d71a38cf44e149aaa4725bcb86d5fc6d86c 100644 (file)
--- a/opendaylight/md-sal/sal-schema-repository-api/pom.xml
+++ b/opendaylight/md-sal/sal-schema-repository-api/pom.xml
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>sal-parent</artifactId>\r
-    <version>1.0-SNAPSHOT</version>\r
+    <version>1.1-1-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>sal-schema-repository-api</artifactId>\r
   <scm>\r

diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml
index f1bfe8ec2673ed1572bf8e8af1e4aae80e10a0a4..6d6a138a218ddda15c85de249525db1bad27b44c 100644 (file)
--- a/opendaylight/md-sal/samples/pom.xml
+++ b/opendaylight/md-sal/samples/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <artifactId>sal-parent</artifactId>
-               <version>1.0</version>
+               <version>1.1-1-SNAPSHOT</version>
                <groupId>org.opendaylight.controller</groupId>
        </parent>
        <packaging>pom</packaging>
@@ -11,7 +11,7 @@
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
        <modules>

diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
index 4b77e8a1352fa9a5e8211d82debbf2246e259a2a..b3cd2b61edbbb631e8ea9623b310d7ddf8496f79 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>sal-samples</artifactId>
                <groupId>org.opendaylight.controller.samples</groupId>
-               <version>1.0</version>
+               <version>1.1-1-SNAPSHOT</version>
        </parent>
        <artifactId>sample-toaster-consumer</artifactId>
        <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
        <build>
@@ -39,7 +39,7 @@
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>sal-binding-api</artifactId>
-                       <version>1.0</version>
+                       <version>1.1-1-SNAPSHOT</version>
                </dependency>
        </dependencies>
 </project>

diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml
index a1925a53b505a616b1dc3cd6b6d99146a7fe97f7..b0377dc6e7e2b7e80a74a27ab1ef405125ab0952 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-it/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sal-samples</artifactId>
         <groupId>org.opendaylight.controller.samples</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sample-toaster-it</artifactId>
     <scm>

diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml
index f23b8ef524158fff3376fcc5cd373430cab0668a..f9a7ebe070d14cd862f1635a4b17e73d060483c1 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sal-samples</artifactId>
         <groupId>org.opendaylight.controller.samples</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sample-toaster-provider</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
 
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml
index 1fea6b166b6f80be9abd525edcd46cc14fa51921..3a47f3fe64a774eea79c35589ff565253c9ef0ba 100644 (file)
--- a/opendaylight/md-sal/samples/toaster/pom.xml
+++ b/opendaylight/md-sal/samples/toaster/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>sal-samples</artifactId>
         <groupId>org.opendaylight.controller.samples</groupId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sample-toaster</artifactId>
     <packaging>bundle</packaging>
@@ -11,7 +11,7 @@
       <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
       <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
       <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <build>

diff --git a/opendaylight/md-sal/statistics-manager/pom.xml b/opendaylight/md-sal/statistics-manager/pom.xml
index acbd6efd391f077c762ebe46c5d5c6e195eff4ae..e8076e8b1cf43762c037642d4c86dabcee7c3a2b 100644 (file)
--- a/opendaylight/md-sal/statistics-manager/pom.xml
+++ b/opendaylight/md-sal/statistics-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
     <artifactId>statistics-manager</artifactId>
@@ -12,7 +12,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
@@ -23,17 +23,17 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-base</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>

diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
index 1c723eeccad10e998f601c7ea2d0fc8b7f4af4e4..039d2aff2cd4f24e4f32c83967cf67a8e8e5fc8b 100644 (file)
--- a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
+++ b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>sal-test-parent</artifactId>
         <groupId>org.opendaylight.controller.tests</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <artifactId>sal-rest-connector-it</artifactId>
     <scm>

diff --git a/opendaylight/md-sal/topology-lldp-discovery/pom.xml b/opendaylight/md-sal/topology-lldp-discovery/pom.xml
index 90fd338c1239f3776e8945575c447f909051a4c4..70e7c5e4a666637b0d4d8996ed01d1ecb3184f52 100644 (file)
--- a/opendaylight/md-sal/topology-lldp-discovery/pom.xml
+++ b/opendaylight/md-sal/topology-lldp-discovery/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
@@ -12,7 +12,7 @@
     <scm>
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
     <properties>
         <guava.version>14.0.1</guava.version>
@@ -28,27 +28,27 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>    
            <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-base</artifactId>
-             <version>1.0</version>
+             <version>1.1-1-SNAPSHOT</version>
            </dependency>
           <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-management</artifactId>
-             <version>1.0</version>
+             <version>1.1-1-SNAPSHOT</version>
            </dependency>    
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>
@@ -76,7 +76,7 @@
     <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.7.0</version>
+            <version>0.7.1-1-SNAPSHOT</version>
         </dependency>
              
     </dependencies>

diff --git a/opendaylight/md-sal/topology-manager/pom.xml b/opendaylight/md-sal/topology-manager/pom.xml
index 9eb52be77e8885df48603284272fc7b4b8083728..cca814ac86c6af7dad02b915dbadc12beb683e41 100644 (file)
--- a/opendaylight/md-sal/topology-manager/pom.xml
+++ b/opendaylight/md-sal/topology-manager/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-parent</artifactId>
-        <version>1.0</version>
+        <version>1.1-1-SNAPSHOT</version>
     </parent>
     <groupId>org.opendaylight.controller.md</groupId>
     <artifactId>topology-manager</artifactId>
@@ -12,7 +12,7 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
-      <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+      <tag>stable/hydrogen</tag>
   </scm>
 
     <dependencies>
@@ -23,27 +23,27 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-util</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-topology</artifactId>
-            <version>1.0</version>
+            <version>1.1-1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.xtend</groupId>

diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml
index 5aa98ad0b6f96e992cec504b722f8603c0581083..4dbab56ddfdf9963831bcf0ef44d230b2deb0def 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/pom.xml
+++ b/opendaylight/netconf/config-netconf-connector/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>config-netconf-connector</artifactId>
     <name>${project.artifactId}</name>

diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml
index b91edc046100d97bc798b111266fc06026be97c5..42da67895e9f9988d0dd893e407499f1808ab485 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/pom.xml
+++ b/opendaylight/netconf/config-persister-impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>config-persister-impl</artifactId>
     <name>${project.artifactId}</name>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
index 7b6c45eb23a33a6112bbc825390b73742f96e7fb..2c3030f20676fe42e99d31415065dccb940a0ce9 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-netconf-monitoring-extension</artifactId>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
index 75d0c7b4d4af4d8e153930fb060f61d154dd92be..675d45f3e205cd23b71f7b09a0a6f13230017c56 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ietf-netconf-monitoring</artifactId>

diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml
index f2022e4d0644d02ce4721ecf013569939347afc3..d21861bc31e1c9beef72f5817ce581628e6cdc8f 100644 (file)
--- a/opendaylight/netconf/netconf-api/pom.xml
+++ b/opendaylight/netconf/netconf-api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-api</artifactId>

diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml
index 292093ab219c4ceb05146b60aca8aed4992b5de0..242d3ddba7f504a6b87ffd58082b1404a43ba477 100644 (file)
--- a/opendaylight/netconf/netconf-client/pom.xml
+++ b/opendaylight/netconf/netconf-client/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>netconf-client</artifactId>
     <name>${project.artifactId}</name>

diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index 37457865b9ea772d7c6befaa6219c188cbe78074..5ab2ce874ddacbe414d596677de0bee5ec1d0b1f 100644 (file)
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-impl</artifactId>

diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml
index b9a4cb729ea3811f4b4717c1ec6579af6a6a1345..34c171eb830445bd5e2339f6ae2185f605e74992 100644 (file)
--- a/opendaylight/netconf/netconf-it/pom.xml
+++ b/opendaylight/netconf/netconf-it/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>netconf-it</artifactId>

diff --git a/opendaylight/netconf/netconf-mapping-api/pom.xml b/opendaylight/netconf/netconf-mapping-api/pom.xml
index a1b291e0d7dbd6874d4d7e86cc4f26a4448d4c73..9a69b29b0539a9a39cbecb651b24194d2a146d7d 100644 (file)
--- a/opendaylight/netconf/netconf-mapping-api/pom.xml
+++ b/opendaylight/netconf/netconf-mapping-api/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-mapping-api</artifactId>

diff --git a/opendaylight/netconf/netconf-monitoring/pom.xml b/opendaylight/netconf/netconf-monitoring/pom.xml
index 48da07f9b78ec96e56989acb3376ec7fbca64e15..d28f24da6b60b4acd88210bea70be692d340bc8c 100644 (file)
--- a/opendaylight/netconf/netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/netconf-monitoring/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>netconf-monitoring</artifactId>

diff --git a/opendaylight/netconf/netconf-ssh/pom.xml b/opendaylight/netconf/netconf-ssh/pom.xml
index 5ae79047ae59a7c818a338ff6a2154e52c36494b..873fec2eefd0e4b110b72073025a0bcfbd12a709 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/pom.xml
+++ b/opendaylight/netconf/netconf-ssh/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>usermanager</artifactId>
-            <version>0.4.1</version>
+            <version>0.4.2-1-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml
index 3caafcdc6974643421bd6979cacf1995298c42a3..419492bac87a0ead2c476dfd05410c3bf92fe97b 100644 (file)
--- a/opendaylight/netconf/netconf-util/pom.xml
+++ b/opendaylight/netconf/netconf-util/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.3</version>
+        <version>0.2.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>netconf-util</artifactId>
     <name>${project.artifactId}</name>

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index 4450f3794c09073b2c847e13729a5add2e0db862..66795e21df386173e15cdc6599454befc274ec7e 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2-1-SNAPSHOT</version>
         <relativePath>../commons/opendaylight</relativePath>
     </parent>
 
-    <version>0.2.3</version>
+    <version>0.2.4-1-SNAPSHOT</version>
     <artifactId>netconf-subsystem</artifactId>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
@@ -48,8 +48,8 @@
         <maven.bundle.version>2.4.0</maven.bundle.version>
         <slf4j.version>1.7.2</slf4j.version>
         <netconf.netty.version>4.0.10.Final</netconf.netty.version>
-        <netconf.version>0.2.3</netconf.version>
-        <config.version>0.2.3</config.version>
+        <netconf.version>0.2.4-1-SNAPSHOT</netconf.version>
+        <config.version>0.2.4-1-SNAPSHOT</config.version>
     </properties>
 
     <dependencies>

diff --git a/opendaylight/networkconfiguration/neutron/implementation/pom.xml b/opendaylight/networkconfiguration/neutron/implementation/pom.xml
index 43a2291de1682062b2bc1b8b40f9ccba9c7106d0..2436fc79d068ae5ed59663d1a3654f30ae20ea3b 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/implementation/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/implementation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <properties>
@@ -14,7 +14,7 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <distributionManagement>
@@ -36,7 +36,7 @@
   </distributionManagement>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>networkconfig.neutron.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>
@@ -80,6 +80,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/networkconfiguration/neutron/pom.xml b/opendaylight/networkconfiguration/neutron/pom.xml
index fd6e5d77af53a5528b29d1cb918a765cfdb6614e..0270eebc9786dccb58a79dc98da85cd5ee79ff11 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/networkconfiguration/neutron/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <properties>
@@ -14,7 +14,7 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
@@ -35,7 +35,7 @@
   </distributionManagement>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>networkconfig.neutron</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>
@@ -71,6 +71,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/northbound/bundlescanner/api/pom.xml b/opendaylight/northbound/bundlescanner/api/pom.xml
index 6c18e5a1e617a7c3c1e94a6d60b2a81627ac12a3..edc9bae7fdff76f589486faf06e235ef41f50c06 100644 (file)
--- a/opendaylight/northbound/bundlescanner/api/pom.xml
+++ b/opendaylight/northbound/bundlescanner/api/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
@@ -11,11 +11,11 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>bundlescanner</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/northbound/bundlescanner/implementation/pom.xml b/opendaylight/northbound/bundlescanner/implementation/pom.xml
index a443d991993f391fdacffdc67e89fbec4512fe21..1b5da8173dd7dc785eeeac28fd26f3c19afa85e0 100644 (file)
--- a/opendaylight/northbound/bundlescanner/implementation/pom.xml
+++ b/opendaylight/northbound/bundlescanner/implementation/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
 
@@ -11,11 +11,11 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>bundlescanner.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml
index c96907f750911341acf9a37fdccf97733fee2f76..071dfc0ed75bd8f6c220afb8542a814d6a2fed2f 100644 (file)
--- a/opendaylight/northbound/commons/pom.xml
+++ b/opendaylight/northbound/commons/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>commons.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/northbound/connectionmanager/pom.xml b/opendaylight/northbound/connectionmanager/pom.xml
index b46996b3ac61eb94f4dd64ac4c807c57e44a35ee..ffeec843ca7cb828016d020b8c4f16fca151de1c 100644 (file)
--- a/opendaylight/northbound/connectionmanager/pom.xml
+++ b/opendaylight/northbound/connectionmanager/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>connectionmanager.northbound</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/northbound/containermanager/pom.xml b/opendaylight/northbound/containermanager/pom.xml
index 6b91c516a94261486b72d498e22539555c9ba90e..8850b33f66c00347136ce18a70b8c56ebec15a56 100644 (file)
--- a/opendaylight/northbound/containermanager/pom.xml
+++ b/opendaylight/northbound/containermanager/pom.xml
@@ -4,19 +4,19 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>containermanager.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/northbound/controllermanager/pom.xml b/opendaylight/northbound/controllermanager/pom.xml
index 135ed3a66e2824b5001890fa4822c286248abb79..3469a88677cecaf3f2fe84ccd0f4cf96a8802100 100644 (file)
--- a/opendaylight/northbound/controllermanager/pom.xml
+++ b/opendaylight/northbound/controllermanager/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>controllermanager.northbound</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <build>

diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml
index 80d136691aca6030d40e5b37b28450d32f9b0446..c11d01e2b9d12e3f9fde068fc98deb371230e37c 100644 (file)
--- a/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>flowprogrammer.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml
index de87451337d3a68518c967175077b9cf6cada63e..df343509cfb41db92407a28dc18bb292b5a7c230 100644 (file)
--- a/opendaylight/northbound/hosttracker/pom.xml
+++ b/opendaylight/northbound/hosttracker/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>hosttracker.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <build>

diff --git a/opendaylight/northbound/httpservice-bridge/pom.xml b/opendaylight/northbound/httpservice-bridge/pom.xml
index 8a0c0e2ef36103513132926cb91f62135a64db48..9c899393e39979daccb3e75db90805fdf91eddb8 100644 (file)
--- a/opendaylight/northbound/httpservice-bridge/pom.xml
+++ b/opendaylight/northbound/httpservice-bridge/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>httpservice-bridge</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.2-1-SNAPSHOT</version>
   <description>HttpService bridge web application</description>
   <packaging>bundle</packaging>
 

diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml
index 24a80d86534d8baef27a42182a86e22f1bc6b9a7..694057cb41478c56066c8ed500991b975d27810f 100644 (file)
--- a/opendaylight/northbound/integrationtest/pom.xml
+++ b/opendaylight/northbound/integrationtest/pom.xml
@@ -4,19 +4,19 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>northbound.integrationtest</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <pluginRepositories>
     <pluginRepository>
       <id>central</id>

diff --git a/opendaylight/northbound/java-client/pom.xml b/opendaylight/northbound/java-client/pom.xml
index 48bbdc609164cdcf35a96570c8fa3716f6c23b0a..30315741e217a87bf5ed5441983d15d615983838 100644 (file)
--- a/opendaylight/northbound/java-client/pom.xml
+++ b/opendaylight/northbound/java-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
@@ -148,7 +148,7 @@
                   <type>jar</type>
                   <classifier>full-java-client-sources</classifier>
                 </artifact>
-                <artifact>
+                <!--artifact>
                   <file>${json-client}</file>
                   <type>jar</type>
                   <classifier>full-json-client</classifier>
@@ -157,7 +157,7 @@
                   <file>${json-client-sources}</file>
                   <type>jar</type>
                   <classifier>full-json-client-sources</classifier>
-                </artifact>
+                </artifact-->
               </artifacts>
             </configuration>
           </execution>

diff --git a/opendaylight/northbound/jolokia/pom.xml b/opendaylight/northbound/jolokia/pom.xml
index 3d95aa34291a056aa016906ea2b11fcedf6b91cf..4d920481d6448809f0884818f951b23da6feb9b2 100644 (file)
--- a/opendaylight/northbound/jolokia/pom.xml
+++ b/opendaylight/northbound/jolokia/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>jolokia-bridge</artifactId>
   <description>Jolokia bridge web application</description>
-  <version>0.0.1</version>
+  <version>0.0.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
index 045e646aac3d020d18a0f9ae9ca0ed157c2121f8..5e4e3cfd668009e5fbb82c362bd69729e4950dda 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
+++ b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>networkconfig.bridgedomain.northbound</artifactId>
-  <version>0.0.2</version>
+  <version>0.0.3-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/northbound/networkconfiguration/neutron/pom.xml b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
index bcf61cd17f03cda7c75fd5e45c86af7a20e4872a..c3a5bb4e2883e811d890ae97af9713654617ab04 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/neutron/pom.xml
+++ b/opendaylight/northbound/networkconfiguration/neutron/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2-1-SNAPSHOT</version>
         <relativePath>../../../commons/opendaylight</relativePath>
     </parent>
     <properties>
@@ -14,7 +14,7 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
     <distributionManagement>
@@ -36,7 +36,7 @@
     </distributionManagement>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>networkconfig.neutron.northbound</artifactId>
-    <version>0.4.1</version>
+    <version>0.4.2-1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <build>

diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml
index 59a7b3b1bc0f95c9a02a43c8e3297ec138b6516e..38fd85d5b437382d83c5193a2df22b81da5a63c6 100644 (file)
--- a/opendaylight/northbound/staticrouting/pom.xml
+++ b/opendaylight/northbound/staticrouting/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>forwarding.staticrouting.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml
index 5ec27050d497f60628bfba3d4e62a64fe61a7443..13c25fcfd394e0da2e7a85d846e089547b9c310c 100644 (file)
--- a/opendaylight/northbound/statistics/pom.xml
+++ b/opendaylight/northbound/statistics/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>statistics.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml
index 3eea7d38d353dff18092f16a634392a199bfccd7..0a8a03d7173aa113aa87a922600cc8475f37496f 100644 (file)
--- a/opendaylight/northbound/subnets/pom.xml
+++ b/opendaylight/northbound/subnets/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>subnets.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml
index 4ef3f956dfe7895c9e96f2e4e2567ee6c00b02b0..e83ed95287425388e72ebc93dbb2bc0cd8db6874 100644 (file)
--- a/opendaylight/northbound/switchmanager/pom.xml
+++ b/opendaylight/northbound/switchmanager/pom.xml
@@ -4,17 +4,17 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <artifactId>switchmanager.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <build>

diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml
index 5b3f22c0b24c15f1e67c40c26c5341f34fb032a3..9fc2ccd0e94986a19c2457d17427c6b0d38aec53 100644 (file)
--- a/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>topology.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/northbound/usermanager/pom.xml b/opendaylight/northbound/usermanager/pom.xml
index 4be3e148ba1468a5c2fae89293a443b8b199212f..9226351b677517891021f3dbca111d4a3387f4e4 100644 (file)
--- a/opendaylight/northbound/usermanager/pom.xml
+++ b/opendaylight/northbound/usermanager/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>usermanager.northbound</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/northboundtest/unit_test_suite/pom.xml b/opendaylight/northboundtest/unit_test_suite/pom.xml
index 5a0f5f3254518733ddb7060ba6fba0cbb24dd3a7..c0bdbd8fe904f546bb6ac2abf20750fff3f564f7 100644 (file)
--- a/opendaylight/northboundtest/unit_test_suite/pom.xml
+++ b/opendaylight/northboundtest/unit_test_suite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../opendaylight/commons/opendaylight</relativePath>
   </parent>
   <scm>

diff --git a/opendaylight/protocol_plugins/openflow/pom.xml b/opendaylight/protocol_plugins/openflow/pom.xml
index 7e52968bbfe87cd42c380cb5a1cbc421a400c06b..4ed88ddce3bfd4ec8d841a819aacca27bd780abc 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/pom.xml
+++ b/opendaylight/protocol_plugins/openflow/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>protocol_plugins.openflow</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/protocol_plugins/stub/pom.xml b/opendaylight/protocol_plugins/stub/pom.xml
index b125b6bbab5f5f97863d784b7dd43fb82e5c3336..4fed453080f7142f2e47058d87c41e5543a92533 100644 (file)
--- a/opendaylight/protocol_plugins/stub/pom.xml
+++ b/opendaylight/protocol_plugins/stub/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>protocol_plugins.stub</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/routing/dijkstra_implementation/pom.xml b/opendaylight/routing/dijkstra_implementation/pom.xml
index e2f918b3bb844614b35a929a9d116997fa2980ee..4c081a0e7d8a195c28dc236eab14ba865f02ef72 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/pom.xml
+++ b/opendaylight/routing/dijkstra_implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>routing.dijkstra_implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/sal/api/pom.xml b/opendaylight/sal/api/pom.xml
index 994b9918c41b44f2763eceb6b8fc57b32d4bd3b1..0b75524e1eb5e052ae1af45e7cd328c8575c9219 100644 (file)
--- a/opendaylight/sal/api/pom.xml
+++ b/opendaylight/sal/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>sal</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/sal/connection/api/pom.xml b/opendaylight/sal/connection/api/pom.xml
index 0224f7052ce128ed60991631a2973b169cb193cd..c928783e03808a595071ba5d4870ede0c4364d00 100644 (file)
--- a/opendaylight/sal/connection/api/pom.xml
+++ b/opendaylight/sal/connection/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>sal.connection</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/sal/connection/implementation/pom.xml b/opendaylight/sal/connection/implementation/pom.xml
index ae79a8467fc7263c1fc9f5fe864d9e70f2ce7f1b..9123e4d5a878502382417f52ef3ec332de730ce0 100644 (file)
--- a/opendaylight/sal/connection/implementation/pom.xml
+++ b/opendaylight/sal/connection/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>sal.connection.implementation</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/sal/implementation/pom.xml b/opendaylight/sal/implementation/pom.xml
index b174df0d3c5395043925fb2cd04b16fafb2360ca..c5dbc31e105990ff608125b7853b8eab911e4898 100644 (file)
--- a/opendaylight/sal/implementation/pom.xml
+++ b/opendaylight/sal/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>sal.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
-      <version>0.7.0</version>
+      <version>0.7.1-1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>equinoxSDK381</groupId>

diff --git a/opendaylight/sal/networkconfiguration/api/pom.xml b/opendaylight/sal/networkconfiguration/api/pom.xml
index 7baab4d6cd9da41f8c69d1305f51a31dd318e4c2..cd609d8519f0add422f16d4fa397f1cfec7b402e 100644 (file)
--- a/opendaylight/sal/networkconfiguration/api/pom.xml
+++ b/opendaylight/sal/networkconfiguration/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>sal.networkconfiguration</artifactId>
-  <version>0.0.2</version>
+  <version>0.0.3-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/sal/networkconfiguration/implementation/pom.xml b/opendaylight/sal/networkconfiguration/implementation/pom.xml
index 55b60f8b7faaeb2ebe0ae9e604bed82f0f9954ba..116d410179c4042e53ec825ca0f0daa6d51fccf9 100644 (file)
--- a/opendaylight/sal/networkconfiguration/implementation/pom.xml
+++ b/opendaylight/sal/networkconfiguration/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>sal.networkconfiguration.implementation</artifactId>
-  <version>0.0.2</version>
+  <version>0.0.3-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/samples/loadbalancer/pom.xml b/opendaylight/samples/loadbalancer/pom.xml
index 20b8760d108b9e7cf1e717feab2f27b795fc5c49..81285281122da03559c9266ca24e900069eba1b6 100644 (file)
--- a/opendaylight/samples/loadbalancer/pom.xml
+++ b/opendaylight/samples/loadbalancer/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>samples.loadbalancer</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml
index 0f89769b7adffc7bf7c448005774dc9762c27d82..1ca4b57fd1b48ba30eb23c388f324cfecb6e2dc5 100644 (file)
--- a/opendaylight/samples/northbound/loadbalancer/pom.xml
+++ b/opendaylight/samples/northbound/loadbalancer/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>samples.loadbalancer.northbound</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -28,7 +28,7 @@
           <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.7.0</version>
+            <version>0.7.1-1-SNAPSHOT</version>
           </dependency>
         </dependencies>
       </plugin>

diff --git a/opendaylight/samples/simpleforwarding/pom.xml b/opendaylight/samples/simpleforwarding/pom.xml
index a7da62c48f6e5f753f3a0138368292f63578003c..7c17cfeb38792d8f51915f24316992c30347f238 100644 (file)
--- a/opendaylight/samples/simpleforwarding/pom.xml
+++ b/opendaylight/samples/simpleforwarding/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>samples.simpleforwarding</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>

diff --git a/opendaylight/security/pom.xml b/opendaylight/security/pom.xml
index 4292107ea59fb400c3784deeb732042ebde496f7..f649f75f2a6c8cfb94c8a0a9e877d287c761b2b2 100644 (file)
--- a/opendaylight/security/pom.xml
+++ b/opendaylight/security/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>security</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/statisticsmanager/api/pom.xml b/opendaylight/statisticsmanager/api/pom.xml
index 703b8a1a2f3f8a8cf3bfd9f83608a749f083e4d7..7da1eacccb3d12727999a9e45589e0fe5d660d31 100644 (file)
--- a/opendaylight/statisticsmanager/api/pom.xml
+++ b/opendaylight/statisticsmanager/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>statisticsmanager</artifactId>
-  <version>0.5.0</version>
+  <version>0.5.1-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/statisticsmanager/implementation/pom.xml b/opendaylight/statisticsmanager/implementation/pom.xml
index 8d246f87797cc840c6d935d33ce92ccaeffc764e..3021c0076e25632dff36104da8a71effb7ecf2c9 100644 (file)
--- a/opendaylight/statisticsmanager/implementation/pom.xml
+++ b/opendaylight/statisticsmanager/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>statisticsmanager.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <properties>
     <!-- Sonar properties using jacoco to retrieve integration test results -->

diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/statisticsmanager/integrationtest/pom.xml
index 42d706696f1960422dcfff8b19d64fb00fb4fd93..24d3ec5a1f9e0cf4d1cd25dcde38f2058a42beb0 100644 (file)
--- a/opendaylight/statisticsmanager/integrationtest/pom.xml
+++ b/opendaylight/statisticsmanager/integrationtest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>statisticsmanager.integrationtest</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml
index e3a1bf1d7120e3e182fe6e2eb37ac1880b2d2b9b..fee44b966175e5f969bb188cccd5c8a11480425d 100644 (file)
--- a/opendaylight/switchmanager/api/pom.xml
+++ b/opendaylight/switchmanager/api/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>switchmanager</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
@@ -86,6 +86,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/switchmanager/implementation/pom.xml b/opendaylight/switchmanager/implementation/pom.xml
index 412ea3eb9c38c8c89cc8c03a1e3f410c295c0cef..5749858f51608595422fb41befd434acbf2cd5bb 100644 (file)
--- a/opendaylight/switchmanager/implementation/pom.xml
+++ b/opendaylight/switchmanager/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>switchmanager.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <properties>
@@ -97,6 +97,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/switchmanager/integrationtest/pom.xml b/opendaylight/switchmanager/integrationtest/pom.xml
index 167f3a562ddfaf44b0f3150ea00124edab3b219a..d6c23abb241489849026e68c2631f4185daa5071 100644 (file)
--- a/opendaylight/switchmanager/integrationtest/pom.xml
+++ b/opendaylight/switchmanager/integrationtest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>switchmanager.integrationtest</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
 
   <dependencies>
     <dependency>

diff --git a/opendaylight/topologymanager/implementation/pom.xml b/opendaylight/topologymanager/implementation/pom.xml
index f3efd347e73015a7ab35e41037e3369b37c37681..2941ce68061c7886b79a0c4bf9964c80b3f8b7e2 100644 (file)
--- a/opendaylight/topologymanager/implementation/pom.xml
+++ b/opendaylight/topologymanager/implementation/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>topologymanager</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -57,6 +57,11 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>

diff --git a/opendaylight/topologymanager/integrationtest/pom.xml b/opendaylight/topologymanager/integrationtest/pom.xml
index f88e213aa0517e5b4fa5fd45d61fc2e265796bb4..54c62ed3a98076f6b02a66c5631d4eced78a9b85 100644 (file)
--- a/opendaylight/topologymanager/integrationtest/pom.xml
+++ b/opendaylight/topologymanager/integrationtest/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.integrationtest</artifactId>
-    <version>0.5.1</version>
+    <version>0.5.2-1-SNAPSHOT</version>
     <relativePath>../../commons/integrationtest</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>topologymanager.integrationtest</artifactId>
-  <version>0.4.0</version>
+  <version>0.4.1-1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>

diff --git a/opendaylight/usermanager/api/pom.xml b/opendaylight/usermanager/api/pom.xml
index c4ab2bb80312aa388241c27c6c1e80d81b5ddda8..6e640083908e7b06b43802cea0769c46d67e51cd 100644 (file)
--- a/opendaylight/usermanager/api/pom.xml
+++ b/opendaylight/usermanager/api/pom.xml
@@ -3,18 +3,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>usermanager</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>
@@ -61,6 +61,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/usermanager/implementation/pom.xml b/opendaylight/usermanager/implementation/pom.xml
index 322906b940b0622a83652813e1703898a628df07..d17868af886e68c723f1277d36c819e14175bcdc 100644 (file)
--- a/opendaylight/usermanager/implementation/pom.xml
+++ b/opendaylight/usermanager/implementation/pom.xml
@@ -3,18 +3,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>usermanager.implementation</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>
@@ -81,6 +81,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/web/brandfragment/pom.xml b/opendaylight/web/brandfragment/pom.xml
index 541dbcadfd8644023b03055f3109220cf604ecd3..72ee95de27bcc6d5231cd9de2e0eafd9452c32eb 100644 (file)
--- a/opendaylight/web/brandfragment/pom.xml
+++ b/opendaylight/web/brandfragment/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.opendaylight</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
+        <version>1.4.2-1-SNAPSHOT</version>
         <relativePath>../../commons/opendaylight</relativePath>
     </parent>
   <scm>

diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml
index 3cf0a29adba4a460577aaea918ea7bd12aaacecf..2cd591411c8986f5c7be811306a6b4ca57da3406 100644 (file)
--- a/opendaylight/web/devices/pom.xml
+++ b/opendaylight/web/devices/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>devices.web</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml
index 25213c9eacbc9e941a85689d8d24d04f75746beb..04631e7cdb501ad4b74121e5c5cb67deb55a9c43 100644 (file)
--- a/opendaylight/web/flows/pom.xml
+++ b/opendaylight/web/flows/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>flows.web</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/opendaylight/web/osgi-brandfragment/pom.xml b/opendaylight/web/osgi-brandfragment/pom.xml
index 2fcf95706c67bdecb929f6ad08270546456539d5..0f9b19203253ef9bfc485dda5262eab8a29e7dc6 100644 (file)
--- a/opendaylight/web/osgi-brandfragment/pom.xml
+++ b/opendaylight/web/osgi-brandfragment/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
 
   <artifactId>osgi-brandfragment.web</artifactId>
-  <version>0.0.1</version>
+  <version>0.0.2-1-SNAPSHOT</version>
   <description>OSGi management web application brand fragment</description>
   <packaging>bundle</packaging>
 

diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml
index 22a79f286af6041a1289eb807cbb47fdbe0c400a..eb2b38c123f09923fdeddde5a0a0b39189e68844 100644 (file)
--- a/opendaylight/web/root/pom.xml
+++ b/opendaylight/web/root/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>web</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <build>
@@ -105,6 +105,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml
index b3c79ffce1ad137e2c1168d8eab153ef4dda13a4..2bf45655b27c2ce1ea0d3e680bdd90505e1458d0 100644 (file)
--- a/opendaylight/web/topology/pom.xml
+++ b/opendaylight/web/topology/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>topology.web</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>
@@ -99,6 +99,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>configuration</artifactId>
+      <version>${configuration.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml
index 788acfc4a1dcd3e0a0bfb7c147fd3346bebeb277..78c1582c16e7c105df1ee3d2eef55d7102290cbc 100644 (file)
--- a/opendaylight/web/troubleshoot/pom.xml
+++ b/opendaylight/web/troubleshoot/pom.xml
@@ -4,18 +4,18 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.opendaylight</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-1-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <artifactId>troubleshoot.web</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2-1-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <build>
     <plugins>

diff --git a/pom.xml b/pom.xml
index 4b208a48938138360370868277bbdacfa19b0e58..71f587540bda9c9265165b3e9ec867521f568ab3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,16 +8,16 @@
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-1-SNAPSHOT</version>
     <relativePath>opendaylight/commons/parent</relativePath>
   </parent>
   <artifactId>releasepom</artifactId>
-  <version>0.1.1</version>
+  <version>0.1.2-1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>opendaylight/distribution/opendaylight</module>

diff --git a/third-party/com.siemens.ct.exi/pom.xml b/third-party/com.siemens.ct.exi/pom.xml
index 7a4f32f25ab75f501ab122668e517f7df9678483..4dfb02de1131e68e85ff3aeee03c4b20a51b00d9 100644 (file)
--- a/third-party/com.siemens.ct.exi/pom.xml
+++ b/third-party/com.siemens.ct.exi/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.thirdparty</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-1-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
   <scm>

diff --git a/third-party/commons/thirdparty/pom.xml b/third-party/commons/thirdparty/pom.xml
index b5399ee7610a9a98524d2f0145ffaa55b4d3a2cb..6651a4f5d33ae0ca3af4965827d838f7b7f6f6ed 100644 (file)
--- a/third-party/commons/thirdparty/pom.xml
+++ b/third-party/commons/thirdparty/pom.xml
@@ -6,13 +6,13 @@
   </prerequisites>
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.thirdparty</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2-1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
     <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-    <tag>master-tagforprepareonly-controller-bulk-release-2-1</tag>
+    <tag>stable/hydrogen</tag>
   </scm>
 
   <properties>

diff --git a/third-party/ganymed/pom.xml b/third-party/ganymed/pom.xml
index e2666e9475272c7336aca1f779fab0ceb87f0d61..1cb579ef539a9e4a6bf89a4d4a2bac62da2df8d4 100644 (file)
--- a/third-party/ganymed/pom.xml
+++ b/third-party/ganymed/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.thirdparty</artifactId>
-        <version>1.1.1</version>
+        <version>1.1.2-1-SNAPSHOT</version>
         <relativePath>../commons/thirdparty</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller.thirdparty</groupId>
     <artifactId>ganymed</artifactId>
-    <version>1.0</version>
+    <version>1.1-1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>

diff --git a/third-party/jersey-servlet/pom.xml b/third-party/jersey-servlet/pom.xml
index 7e944c15da41cf46ebaf14a4b7aa2e2ca7046ab6..f812979a7c047da8421700acb1f05f203f63f915 100644 (file)
--- a/third-party/jersey-servlet/pom.xml
+++ b/third-party/jersey-servlet/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.thirdparty</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-1-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
   <scm>

diff --git a/third-party/net.sf.jung2/pom.xml b/third-party/net.sf.jung2/pom.xml
index fe15316023f41d306be25e2759addf6943cf7ced..3c53a377a2db859fd116adfc35b34b456321cdbb 100644 (file)
--- a/third-party/net.sf.jung2/pom.xml
+++ b/third-party/net.sf.jung2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.thirdparty</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-1-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
   <scm>

diff --git a/third-party/openflowj/pom.xml b/third-party/openflowj/pom.xml
index 8d8724dcebcaec03bf50d6f668d437e77a8dea3c..82739ad1b3e4abd173ab7c533bb17844c0c70642 100644 (file)
--- a/third-party/openflowj/pom.xml
+++ b/third-party/openflowj/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.thirdparty</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-1-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
   

diff --git a/third-party/org.apache.catalina.filters.CorsFilter/pom.xml b/third-party/org.apache.catalina.filters.CorsFilter/pom.xml
index 85e631686e77eb43042e87c5c8536432bd76362b..70ea4f10abf08a45f231839d04a2aec935a2651a 100644 (file)
--- a/third-party/org.apache.catalina.filters.CorsFilter/pom.xml
+++ b/third-party/org.apache.catalina.filters.CorsFilter/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>commons.thirdparty</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-1-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
   <scm>