From d207a2f677545357095f2e5f145a5ecc8d3a60dd Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Fri, 25 Sep 2015 14:26:24 +0200 Subject: [PATCH] Clean up plugin management A number of plugins are managed by odlparent, so remove unnecessary entries (i.e. specified identically in odlparent). Remove all references to ${exam.version} (the dependencies are inherited from odlparent). Change-Id: I43ac4a692b7911321b448e788536d58f916657d1 Signed-off-by: Stephen Kitt --- itests/base-features-it/pom.xml | 2 -- opendaylight/commons/opendaylight/pom.xml | 19 ++----------------- opendaylight/config/pom.xml | 5 ----- opendaylight/md-sal/pom.xml | 5 ----- opendaylight/md-sal/sal-binding-it/pom.xml | 1 - .../md-sal/samples/toaster-it/pom.xml | 3 --- 6 files changed, 2 insertions(+), 33 deletions(-) diff --git a/itests/base-features-it/pom.xml b/itests/base-features-it/pom.xml index a948ec78dd..12a9e076b5 100644 --- a/itests/base-features-it/pom.xml +++ b/itests/base-features-it/pom.xml @@ -25,7 +25,6 @@ org.ops4j.pax.exam pax-exam-container-karaf - ${exam.version} test @@ -36,7 +35,6 @@ org.ops4j.pax.exam pax-exam - ${exam.version} test diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index d45409743a..6fc641e824 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -881,15 +881,10 @@ ${java.version.target} - - org.apache.maven.plugins - maven-jar-plugin - ${jar.plugin.version} - org.apache.maven.plugins maven-javadoc-plugin - 2.8.1 + ${maven.javadoc.version} org.jboss.apiviz.APIviz @@ -920,11 +915,6 @@ target/apidocs - - org.apache.maven.plugins - maven-release-plugin - ${releaseplugin.version} - org.codehaus.enunciate maven-enunciate-plugin @@ -933,11 +923,6 @@ enunciate.xml - - org.codehaus.enunciate - enunciate-swagger - ${enunciate.version} - org.opendaylight.controller commons.logback_settings @@ -1290,7 +1275,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.8.1 + ${maven.javadoc.version} org.jboss.apiviz.APIviz diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 8f8998c3bf..cf28b8a0dd 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -98,11 +98,6 @@ - - org.codehaus.groovy.maven - gmaven-plugin - ${gmaven.plugin.version} - org.opendaylight.yangtools yang-maven-plugin diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 6df1185663..234dcfeb74 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -164,11 +164,6 @@ - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index 5b404c7f25..710d113b00 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -90,7 +90,6 @@ org.ops4j.pax.exam pax-exam - ${exam.version} diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml index c897e07362..77a75f786e 100644 --- a/opendaylight/md-sal/samples/toaster-it/pom.xml +++ b/opendaylight/md-sal/samples/toaster-it/pom.xml @@ -46,7 +46,6 @@ org.ops4j.pax.exam pax-exam-junit4 - ${exam.version} equinoxSDK381 @@ -56,13 +55,11 @@ org.ops4j.pax.exam pax-exam-container-native - ${exam.version} test org.ops4j.pax.exam pax-exam-link-mvn - ${exam.version} test -- 2.36.6