Eliminate blueprint.version 65/89465/1
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 27 Apr 2020 19:53:10 +0000 (21:53 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 27 Apr 2020 19:54:53 +0000 (21:54 +0200)
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
features/odl-controller-blueprint/src/main/feature/feature.xml

index fc85e5c..3d2d824 100644 (file)
 
     <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>
index 5f9f319..94e3c3f 100644 (file)
@@ -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>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.