X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=features%2Fodl-jolokia%2Fpom.xml;h=faadefc6b3d25ddde82fbd0a17585aac88936a05;hb=refs%2Fchanges%2F22%2F97322%2F2;hp=0e0f06776cec1634792eeaf2c29c8540c2262974;hpb=2b61b9f35adcd877cfc5cec01eac6f9ca0c3a854;p=controller.git

diff --git a/features/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
index 0e0f06776c..faadefc6b3 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.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>4.0.3-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>0.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>${project.groupId}</groupId>
+            <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>