X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fextras%2Fodl-jolokia%2Fpom.xml;h=b39c7919732006670586324130855455988ec14a;hb=77e6c0079a1104c5a64d21e212a7b044a54ed710;hp=ef35d577d2a8c7f678d572e73cf9a8a746beed63;hpb=bd9676e69667dcaa7b85d0f8d738b481b0cefdb7;p=controller.git

diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml
index ef35d577d2..b39c791973 100644
--- a/features/extras/odl-jolokia/pom.xml
+++ b/features/extras/odl-jolokia/pom.xml
@@ -6,35 +6,31 @@
  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>3.0.2</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-jolokia</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.11.2-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>Jolokia JMX/HTTP bridge</name>
 
     <properties>
-        <odl-jolokia-osgi.version>0.8.0-SNAPSHOT</odl-jolokia-osgi.version>
+        <odl-jolokia-osgi.version>0.8.2-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" -->