From: Robert Varga <rovarga@cisco.com>
Date: Tue, 12 Jul 2016 13:33:38 +0000 (+0200)
Subject: Do not override jolokia version
X-Git-Tag: release/boron~69
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5bb6275d996e9e1d07509292a6aa595749169f3e;hp=1f2e16571a15e763aa5c1abb5240fe6049956fe1

Do not override jolokia version

Jolokia version is defined in odlparent (as 1.3.3), do not override that.

Change-Id: Ibaa663f9c91ce60cdd809bca1fa7d6a9262e3043
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/features/extras/pom.xml b/features/extras/pom.xml
index c838b29bc0..e13da4339e 100644
--- a/features/extras/pom.xml
+++ b/features/extras/pom.xml
@@ -19,7 +19,6 @@
     <version>1.7.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
-        <jolokia.version>1.3.1</jolokia.version>
         <odl-jolokia-osgi.version>0.4.0-SNAPSHOT</odl-jolokia-osgi.version>
     </properties>
 
@@ -27,7 +26,6 @@
         <dependency>
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-osgi</artifactId>
-            <version>${jolokia.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>