Update 1.15.0-SNAPSHOT to 2.0.0-SNAPSHOT

This performs the final part of version alignment. All artifacts
except config remnants are bumped to 2.0.0-SNAPSHOT, achieving
a consistent version across all non-deprecated functionality.

Change-Id: I8378059b05b32a2abf37ffe5356bb6f3a43628f6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 24e7cb5e63fc785b363f010aeb7135b4e46dd718..94a3993a1dc145c03fd1d687d32c2a7e029f4886 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -352,7 +352,7 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-jolokia</artifactId>
-                <version>1.15.0-SNAPSHOT</version>
+                <version>${project.version}</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>

diff --git a/features/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
index 0e5eaf49a2b65bb6171ac285781e128b445ca430..7febd7a47eaefa477f1e5753dd19927519dd512b 100644 (file)
--- a/features/odl-jolokia/pom.xml
+++ b/features/odl-jolokia/pom.xml
@@ -18,7 +18,6 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-jolokia</artifactId>
-    <version>1.15.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>Jolokia JMX/HTTP bridge</name>
 

diff --git a/features/pom.xml b/features/pom.xml
index 4eee8850cb2732e72f1cf369c2807dbe27ca345e..d31910679ad4d356214b61b86e67a7bea042df8e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>features-aggregator</artifactId>
-  <version>1.15.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index daf59851fd6108549b04936bd4d354034e9fb93f..ab8abcf466372be6b1f84261cceec8665bb02a61 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -17,7 +17,7 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>distribution.opendaylight-karaf</artifactId>
-  <version>1.15.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencyManagement>
@@ -25,7 +25,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>