From: Ryan Goulding <ryandgoulding@gmail.com>
Date: Thu, 12 Apr 2018 15:41:46 +0000 (-0400)
Subject: Rely on odlparent version of jolokia
X-Git-Tag: release/fluorine~120
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=b9ec6955be85a4fb297367d61b7664e645e72dd7

Rely on odlparent version of jolokia

Now that the desired jolokia version is present in odlparent,
rely on pulling it from there instead of locally.

Change-Id: Ief20a133a34b13ec487e04ddabe313a71aaba66d
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
---

diff --git a/features/extras/odl-jolokia/pom.xml b/features/extras/odl-jolokia/pom.xml
index c8799ce301..5536108d1d 100644
--- a/features/extras/odl-jolokia/pom.xml
+++ b/features/extras/odl-jolokia/pom.xml
@@ -31,8 +31,6 @@
         <dependency>
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-osgi</artifactId>
-            <!-- TODO: remove once the version upgrade makes it to odlparent -->
-            <version>1.5.0</version>
         </dependency>
         <dependency>
             <!-- finalname="/etc/org.jolokia.osgi.cfg" -->