Fix odl-jolokia reference

odl-jolokia has an explicit wrong version declared, fix that by
relying solely on declared versions.

Change-Id: I13c90fce89b7df5c8f738fec1152d3db705e4e8b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 0f1dcb2d3bc8ccd296aee612f5f6e1d1d98cf6b0..ad63df4ee4817fe1c80d378a0c524fd3497aaec1 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -33,13 +33,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>aaa-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -65,7 +58,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-jolokia</artifactId>
-            <version>1.14.0</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-aaa-shiro/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index 938d8b4712643c6ab80a1339a05156a55974652e..b18f26ad42bbdf32c311f2f591d3ae92c36c29c9 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -26,5 +26,6 @@
         <feature version="[7,8)">odl-karaf-feat-jdbc</feature>
         <feature version="[7,8)">odl-karaf-feat-jetty</feature>
         <feature version="[7,8)">odl-apache-commons-codec</feature>
+        <feature version="[2,3)">odl-jolokia</feature>
     </feature>
 </features>