Bump versions by x.y.(z+1)

[controller.git] / features / extras / odl-jolokia / pom.xml

diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml
index 1ea9e2e44dbfbc62b5db5d55af012bf1b0c72de2..d013fc75b37dfa1c3a92c5587c0e8ad8e35dc651 100644 (file)
--- a/features/extras/odl-jolokia/pom.xml
+++ b/features/extras/odl-jolokia/pom.xml
@@ -6,33 +6,41 @@
  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>2.0.1</version>
+        <version>6.0.12</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-jolokia</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.14.4-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>Jolokia JMX/HTTP bridge</name>
 
     <properties>
-        <odl-jolokia-osgi.version>0.6.0-SNAPSHOT</odl-jolokia-osgi.version>
+        <odl-jolokia-osgi.version>0.11.4-SNAPSHOT</odl-jolokia-osgi.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-osgi</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jolokia</groupId>
+                    <artifactId>jolokia-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jolokia</groupId>
+                    <artifactId>jolokia-jsr160</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <!-- finalname="/etc/org.jolokia.osgi.cfg" -->