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>
<artifactId>odl-jolokia</artifactId>
<version>1.15.0-SNAPSHOT</version>
<packaging>feature</packaging>
<artifactId>odl-jolokia</artifactId>
<version>1.15.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Jolokia JMX/HTTP bridge</name>
<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>
<dependencies>
<dependency>
<groupId>org.jolokia</groupId>
<!-- finalname="/etc/org.jolokia.osgi.cfg" -->
<groupId>org.opendaylight.controller</groupId>
<artifactId>odl-jolokia-osgi</artifactId>
<!-- 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>
<type>cfg</type>
<classifier>configuration</classifier>
</dependency>
-->
<features name="odl-extras-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
<feature name="odl-jolokia" version="${project.version}">
-->
<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>
<feature>http</feature>
</feature>
</features>