From: Stephen Kitt <skitt@redhat.com>
Date: Tue, 27 Oct 2015 14:52:43 +0000 (+0100)
Subject: Align commons-net and jolokia with odlparent
X-Git-Tag: release/beryllium~93
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=5d6261d886f179bcde600227f9d4c5f815556994

Align commons-net and jolokia with odlparent

Remove controller's overrides of commons-net and jolokia; this
upgrades:
* commons-net 3.0.1 -> 3.3
* joloka 1.1.4 -> 1.3.1

Change-Id: I76b787934740b0024bdc4020527f6a8b5dd01c3c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index a90fdf4a58..735c5f1eb2 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -35,7 +35,6 @@
     <commons.checkstyle.version>0.2.0-SNAPSHOT</commons.checkstyle.version>
     <commons.httpclient.version>0.3.0-SNAPSHOT</commons.httpclient.version>
     <commons.logback_settings.version>0.2.0-SNAPSHOT</commons.logback_settings.version>
-    <commons.net.version>3.0.1</commons.net.version>
     <commons.opendaylight.commons.httpclient>0.3.0-SNAPSHOT</commons.opendaylight.commons.httpclient>
     <commons.opendaylight.concepts.version>0.7.0-SNAPSHOT</commons.opendaylight.concepts.version>
     <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
@@ -90,7 +89,6 @@
     <jdepend.maven.plugin.version>2.0-beta-2</jdepend.maven.plugin.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <jolokia-bridge.version>0.2.0-SNAPSHOT</jolokia-bridge.version>
-    <jolokia.version>1.1.4</jolokia.version>
     <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
     <karaf.shell.version>${karaf.version}</karaf.shell.version>
     <leveldb.version>0.7</leveldb.version>
@@ -278,11 +276,6 @@
             <artifactId>akka-slf4j_${scala.version}</artifactId>
             <version>${akka.version}</version>
         </dependency>
-      <dependency>
-        <groupId>commons-net</groupId>
-        <artifactId>commons-net</artifactId>
-        <version>${commons.net.version}</version>
-      </dependency>
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
@@ -317,11 +310,6 @@
         <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
         <version>2.4</version>
       </dependency>
-      <dependency>
-        <groupId>org.jolokia</groupId>
-        <artifactId>jolokia-osgi</artifactId>
-        <version>${jolokia.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>appauth</artifactId>