From 0e9ea530610685a3398f5c460e7b582e01c7487c Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 27 Apr 2020 21:56:24 +0200
Subject: [PATCH] Eliminate odl-jolokia-osgi.version

This version is aligned with project.version, hence we can
drop the custom property.

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

diff --git a/features/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
index d8dcb3f0ec..0e5eaf49a2 100644
--- a/features/odl-jolokia/pom.xml
+++ b/features/odl-jolokia/pom.xml
@@ -20,13 +20,8 @@
     <artifactId>odl-jolokia</artifactId>
     <version>1.15.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>Jolokia JMX/HTTP bridge</name>
 
-    <properties>
-        <odl-jolokia-osgi.version>2.0.0-SNAPSHOT</odl-jolokia-osgi.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.jolokia</groupId>
@@ -36,7 +31,8 @@
             <!-- finalname="/etc/org.jolokia.osgi.cfg" -->
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-jolokia-osgi</artifactId>
-            <version>${odl-jolokia-osgi.version}</version>
+            <!-- Note: aligned with feature.xml content -->
+            <version>${project.version}</version>
             <type>cfg</type>
             <classifier>configuration</classifier>
         </dependency>
diff --git a/features/odl-jolokia/src/main/feature/feature.xml b/features/odl-jolokia/src/main/feature/feature.xml
index 346d6f7d85..eb4d1d5bb7 100644
--- a/features/odl-jolokia/src/main/feature/feature.xml
+++ b/features/odl-jolokia/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features name="odl-extras-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-jolokia" version="${project.version}">
-        <configfile finalname="/etc/org.jolokia.osgi.cfg">mvn:org.opendaylight.controller/odl-jolokia-osgi/${odl-jolokia-osgi.version}/cfg/configuration</configfile>
+        <configfile finalname="/etc/org.jolokia.osgi.cfg">mvn:org.opendaylight.controller/odl-jolokia-osgi/${project.version}/cfg/configuration</configfile>
         <feature>http</feature>
     </feature>
 </features>
-- 
2.36.6