From a57462f088c7f84a49fe47236d8c8fb4bbf3972d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 27 Apr 2020 21:58:51 +0200
Subject: [PATCH] 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>
---
 artifacts/pom.xml            | 2 +-
 features/odl-jolokia/pom.xml | 1 -
 features/pom.xml             | 2 +-
 karaf/pom.xml                | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 24e7cb5e63..94a3993a1d 100644
--- 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 0e5eaf49a2..7febd7a47e 100644
--- 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 4eee8850cb..d31910679a 100644
--- 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 daf59851fd..ab8abcf466 100644
--- 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>
-- 
2.36.6