X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fextras%2Fodl-jolokia%2Fpom.xml;h=c8799ce301d0ecdf84f326d73701b4d68d48f81b;hb=refs%2Fchanges%2F76%2F69876%2F11;hp=a46697245c6ded7b332bf911a11c67d1776dd88e;hpb=3354f45e32faaab5452f95f9931274a3580de912;p=controller.git

diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml
index a46697245c..c8799ce301 100644
--- a/features/extras/odl-jolokia/pom.xml
+++ b/features/extras/odl-jolokia/pom.xml
@@ -6,34 +6,42 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-jolokia</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>1.11.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>Jolokia JMX/HTTP bridge</name>
 
     <properties>
-        <odl-jolokia-osgi.version>0.5.0-SNAPSHOT</odl-jolokia-osgi.version>
+        <odl-jolokia-osgi.version>0.8.0-SNAPSHOT</odl-jolokia-osgi.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-osgi</artifactId>
+            <!-- TODO: remove once the version upgrade makes it to odlparent -->
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
+            <!-- finalname="/etc/org.jolokia.osgi.cfg" -->
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-jolokia-osgi</artifactId>
+            <version>${odl-jolokia-osgi.version}</version>
+            <type>cfg</type>
+            <classifier>configuration</classifier>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>