X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fodl-jolokia%2Fpom.xml;h=8c396870c0f21794c1db6cbce1490cb7ec9edbc0;hb=f7893617779e7c4a8bfa41c9aaf765e8db42b1ed;hp=a045b0b48a007938935c0c62325f28912279e81c;hpb=c9dbfaee7d858dd568632d012f431cb4f19672b7;p=controller.git

diff --git a/features/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
index a045b0b48a..8c396870c0 100644
--- a/features/odl-jolokia/pom.xml
+++ b/features/odl-jolokia/pom.xml
@@ -8,38 +8,40 @@
  -->
 <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.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
         <relativePath>../single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
     <artifactId>odl-jolokia</artifactId>
-    <version>1.15.0-SNAPSHOT</version>
     <packaging>feature</packaging>
-
     <name>Jolokia JMX/HTTP bridge</name>
 
-    <properties>
-        <odl-jolokia-osgi.version>1.12.0-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" -->
             <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>
     </dependencies>
-
 </project>