From 3f2b3a81898466645610e2f1e8eabc29a59e7ef2 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 27 Apr 2020 21:53:10 +0200
Subject: [PATCH] Eliminate blueprint.version

We have achieved alignment of blueprint.version with project.version,
which means we can ditch the specialized property.

Change-Id: Iabd86c00b4a5134f528a844f061586b9dc7b8188
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/odl-controller-blueprint/pom.xml                | 9 ++-------
 .../src/main/feature/feature.xml                         | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/features/odl-controller-blueprint/pom.xml b/features/odl-controller-blueprint/pom.xml
index fc85e5ceb7..3d2d824e1a 100644
--- a/features/odl-controller-blueprint/pom.xml
+++ b/features/odl-controller-blueprint/pom.xml
@@ -18,17 +18,11 @@
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-controller-blueprint</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Controller :: Blueprint</name>
     <description>OpenDaylight Controller Blueprint Extension</description>
 
-    <properties>
-        <!-- Note: this is required as it is used in feature.xml -->
-        <blueprint.version>2.0.0-SNAPSHOT</blueprint.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -57,7 +51,8 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>blueprint</artifactId>
-            <version>${blueprint.version}</version>
+            <!-- Note: aligned with feature.xml content -->
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-controller-blueprint/src/main/feature/feature.xml b/features/odl-controller-blueprint/src/main/feature/feature.xml
index 5f9f3193f5..94e3c3f7ef 100644
--- a/features/odl-controller-blueprint/src/main/feature/feature.xml
+++ b/features/odl-controller-blueprint/src/main/feature/feature.xml
@@ -12,6 +12,6 @@
         <feature version="[6,7)">odl-mdsal-binding-api</feature>
         <feature version="[6,7)">odl-mdsal-binding-runtime</feature>
         <feature version="[6,7)">odl-mdsal-dom-api</feature>
-        <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
+        <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${project.version}</bundle>
     </feature>
 </features>
-- 
2.36.6