From: Vaishali Mithbaokar Date: Thu, 19 Jun 2014 21:48:44 +0000 (-0700) Subject: But 1129: Removing hard coded versions from MD-SAL X-Git-Tag: release/helium~615 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=cf23bebaf769ce2a1b84d5016d84eab435e22184 But 1129: Removing hard coded versions from MD-SAL Change-Id: Ic4ea06f1fd644808946dd5111d38152d19b9bf35 Signed-off-by: Vaishali Mithbaokar --- diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index afd518b79a..3f25b7283f 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -48,7 +48,7 @@ 2.4 7.0.32.v201211201952 7.0.32.v201211081135 - 3.1 + 2.6 3.1 0.0.2-SNAPSHOT 3.0.1 @@ -88,6 +88,7 @@ 3.1.6 4.2.0 1.4.2-SNAPSHOT + 2.4.0 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.5.2-SNAPSHOT @@ -114,6 +115,7 @@ 1.7 3.17.1-GA 1.2 + 2.0-beta-2 1.17 1.17 @@ -368,6 +370,11 @@ commons-io ${commons.io.version} + + commons-lang + commons-lang + ${commons.lang.version} + commons-net commons-net @@ -722,11 +729,21 @@ org.eclipse.xtend.lib ${xtend.version} + + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-grizzly2 + 2.4 + org.javassist javassist ${javassist.version} + + org.jboss.resteasy + jaxrs-api + 3.0.4.Final + org.jboss.spec.javax.transaction jboss-transaction-api_1.1_spec @@ -927,6 +944,11 @@ filter-valve ${filtervalve.version} + + org.opendaylight.controller + flow-management-compatibility + ${mdsal.version} + org.opendaylight.controller flowprogrammer.northbound @@ -1147,6 +1169,11 @@ protocol_plugins.stub ${protocol_plugins.stub.version} + + org.opendaylight.controller + remoterpc-routingtable.implementation + ${mdsal.version} + org.opendaylight.controller routing.dijkstra_implementation @@ -1474,6 +1501,37 @@ model-inventory ${mdsal.version} + + org.opendaylight.controller.model + model-topology + ${mdsal.version} + + + org.opendaylight.controller.samples + sample-toaster + ${mdsal.version} + + + org.opendaylight.controller.samples + sample-toaster-consumer + ${mdsal.version} + + + + org.opendaylight.controller.samples + sample-toaster-provider + ${mdsal.version} + + + org.opendaylight.controller.tests + sal-remoterpc-connector-test-consumer + ${mdsal.version} + + + org.opendaylight.controller.tests + sal-remoterpc-connector-test-provider + ${mdsal.version} + org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet @@ -1643,6 +1701,16 @@ yang-ext ${yang-ext.version} + + org.opendaylight.yangtools.thirdparty + antlr4-runtime-osgi-nohead + 4.0 + + + org.opendaylight.yangtools.thirdparty + xtend-lib-osgi + ${xtend.version} + org.openexi nagasena @@ -1675,6 +1743,11 @@ chameleon-mbeans 1.0.0 + + org.reflections + reflections + 0.9.9-RC1 + org.scala-lang scala-library @@ -1696,6 +1769,11 @@ ${slf4j.version} compile + + org.slf4j + slf4j-simple + ${slf4j.version} + org.springframework org.springframework.aop diff --git a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml index fc58ed96e1..62dc2ffa1a 100644 --- a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml @@ -49,7 +49,6 @@ org.opendaylight.controller.model model-topology - 1.1-SNAPSHOT org.slf4j diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml b/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml index 6c79e053e1..168dd14d10 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml @@ -26,7 +26,6 @@ org.opendaylight.controller.model model-topology - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/forwardingrules-manager/pom.xml b/opendaylight/md-sal/forwardingrules-manager/pom.xml index 9bd63d3c3b..b3096e6478 100644 --- a/opendaylight/md-sal/forwardingrules-manager/pom.xml +++ b/opendaylight/md-sal/forwardingrules-manager/pom.xml @@ -18,7 +18,6 @@ org.opendaylight.controller flow-management-compatibility - 1.1-SNAPSHOT org.opendaylight.controller diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 8d4901d31b..5b4f1718bc 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -88,7 +88,7 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 + ${lifecycle.mapping.version} @@ -163,7 +163,7 @@ org.codehaus.mojo findbugs-maven-plugin - 2.4.0 + ${findbugs.maven.plugin.version} Max Low @@ -173,7 +173,7 @@ org.codehaus.mojo jdepend-maven-plugin - 2.0-beta-2 + ${jdepend.maven.plugin.version} diff --git a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml index 6db143ab3e..ce11be1e77 100644 --- a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml +++ b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/pom.xml @@ -21,37 +21,30 @@ org.opendaylight.controller remoterpc-routingtable.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.5.1-SNAPSHOT org.opendaylight.controller sal.implementation - 0.4.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.0-SNAPSHOT org.opendaylight.controller containermanager.it.implementation - 0.5.0-SNAPSHOT org.opendaylight.controller clustering.stub - 0.4.0-SNAPSHOT junit @@ -62,11 +55,6 @@ pax-exam-container-native test - - org.ops4j.pax.exam - pax-exam-junit4 - test - org.ops4j.pax.exam pax-exam-link-mvn @@ -104,7 +92,6 @@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT org.opendaylight.yangtools @@ -117,12 +104,10 @@ org.opendaylight.controller sal-connector-api - 1.0-SNAPSHOT org.opendaylight.controller sal-common-util - 1.0-SNAPSHOT @@ -132,22 +117,10 @@ org.opendaylight.controller sal-common-api - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-common-util - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-binding-broker-impl - 1.0-SNAPSHOT org.opendaylight.controller sal-binding-broker-impl - 1.0-SNAPSHOT org.ops4j.pax.exam @@ -171,44 +144,36 @@ org.opendaylight.controller config-manager - 0.2.3-SNAPSHOT equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 test org.slf4j log4j-over-slf4j - 1.7.2 ch.qos.logback logback-core - 1.0.9 ch.qos.logback logback-classic - 1.0.9 org.opendaylight.yangtools.thirdparty antlr4-runtime-osgi-nohead - 4.0 org.opendaylight.yangtools.thirdparty xtend-lib-osgi - 2.4.3 org.opendaylight.controller clustering.services - 0.4.1-SNAPSHOT junit @@ -219,22 +184,16 @@ equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 org.ops4j.pax.exam pax-exam-junit4 - 3.0.0 - - - org.ops4j.pax.exam - pax-exam-junit4 - 3.0.0 + ${exam.version} org.ops4j.pax.exam pax-exam - 3.0.0 + ${exam.version} diff --git a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml index 1fd4b762c1..d74e7130a4 100644 --- a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml +++ b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml @@ -5,7 +5,7 @@ sal-remoterpc-connector-test-parent org.opendaylight.controller.tests - 1.0-SNAPSHOT + 1.1-SNAPSHOT remoterpc-routingtable-nb-it @@ -56,23 +56,19 @@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.5.1-SNAPSHOT org.osgi org.osgi.core - 5.0.0 junit @@ -81,7 +77,6 @@ org.opendaylight.controller remoterpc-routingtable.implementation - 0.4.1-SNAPSHOT com.google.guava diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 7fc467670d..35b186db6a 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -82,7 +82,6 @@ org.reflections reflections - 0.9.9-RC1 compile diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index d1354f897f..fd5c5be18d 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -48,7 +48,6 @@ org.slf4j slf4j-simple - 1.7.2 test diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index 70847aabea..b8bb891e79 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -9,11 +9,9 @@ sal-binding-it - 3.0.0 ../sal-binding-broker/target/jacoco-it.exec ../sal-binding-broker/target/jacoco.exec - 1.5.0 @@ -80,7 +78,6 @@ org.opendaylight.yangtools.thirdparty antlr4-runtime-osgi-nohead - 4.0 @@ -90,7 +87,6 @@ org.opendaylight.yangtools.thirdparty xtend-lib-osgi - 2.4.3 org.openexi @@ -148,7 +144,7 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 + ${lifecycle.mapping.version} @@ -200,7 +196,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.14.1 false @@ -232,7 +227,6 @@ org.ops4j.pax.exam maven-paxexam-plugin - 1.2.4 generate-config diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml index 0dd25292c2..0bf4b3238d 100644 --- a/opendaylight/md-sal/sal-netconf-connector/pom.xml +++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml @@ -25,7 +25,6 @@ ${project.groupId} sal-common-util - 1.1-SNAPSHOT ${project.groupId} diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml index 89695c124a..8435884e7b 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml @@ -14,34 +14,28 @@ org.opendaylight.controller containermanager - 0.5.2-SNAPSHOT org.opendaylight.controller sal - 0.8.1-SNAPSHOT org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-core-api - 1.1-SNAPSHOT org.opendaylight.yangtools diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml index bd0e43bada..2b9dc0cf25 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/provider-service/pom.xml @@ -33,30 +33,25 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-core-api - 1.1-SNAPSHOT org.opendaylight.controller containermanager - 0.5.2-SNAPSHOT org.opendaylight.controller sal - 0.8.1-SNAPSHOT org.opendaylight.yangtools @@ -77,12 +72,10 @@ org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-remoterpc-connector - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml index 84e9d29c72..0ffc330f90 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml @@ -13,29 +13,12 @@ https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - 2.3.0 - 3.0.0 - 1.5.0 - - - - - - commons-codec - commons-codec - 1.7 - - - - org.ops4j.pax.exam maven-paxexam-plugin - 1.2.4 generate-config @@ -53,7 +36,7 @@ org.eclipse.m2e lifecycle-mapping - 1.0.0 + ${lifecycle.mapping.version} @@ -90,22 +73,18 @@ org.opendaylight.yangtools.thirdparty xtend-lib-osgi - 2.4.3 org.opendaylight.controller.tests sal-remoterpc-connector-test-provider - 1.1-SNAPSHOT org.opendaylight.controller.tests sal-remoterpc-connector-test-consumer - 1.1-SNAPSHOT org.opendaylight.controller sal-broker-impl - 1.1-SNAPSHOT org.ops4j.pax.exam @@ -128,55 +107,45 @@ org.ops4j.pax.url pax-url-aether - 1.5.2 test equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 test org.slf4j log4j-over-slf4j - 1.7.2 ch.qos.logback logback-core - 1.0.9 ch.qos.logback logback-classic - 1.0.9 org.opendaylight.controller sal-binding-api - 1.0-SNAPSHOT org.opendaylight.controller sal-common-util - 1.0-SNAPSHOT org.opendaylight.controller sal-core-api - 1.0-SNAPSHOT org.opendaylight.controller sal-remoterpc-connector - 1.0-SNAPSHOT org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.osgi @@ -211,29 +180,24 @@ org.opendaylight.controller sal-common-util - 1.0-SNAPSHOT org.opendaylight.yangtools.thirdparty antlr4-runtime-osgi-nohead - 4.0 org.opendaylight.controller zeromq-routingtable.implementation - 0.4.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.5.1-SNAPSHOT org.osgi @@ -244,7 +208,6 @@ org.opendaylight.controller sal.implementation - 0.4.0-SNAPSHOT commons-io @@ -255,7 +218,6 @@ org.opendaylight.controller containermanager - 0.5.0-SNAPSHOT org.osgi @@ -270,7 +232,6 @@ org.opendaylight.controller containermanager.it.implementation - 0.5.0-SNAPSHOT commons-io @@ -281,7 +242,6 @@ org.opendaylight.controller clustering.stub - 0.4.0-SNAPSHOT commons-io @@ -293,7 +253,6 @@ org.apache.felix org.apache.felix.dependencymanager.shell - 3.0.1 org.osgi @@ -304,7 +263,6 @@ eclipselink javax.resource - 1.5.0.v200906010428 com.google.guava @@ -313,12 +271,10 @@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT org.opendaylight.controller ietf-netconf-monitoring - 0.2.5-SNAPSHOT org.opendaylight.yangtools @@ -327,38 +283,31 @@ org.opendaylight.yangtools.model yang-ext - 2013.09.07.3 org.opendaylight.yangtools.model opendaylight-l2-types - 2013.08.27.3 org.opendaylight.controller sal-binding-it - 1.0-SNAPSHOT org.opendaylight.controller sal-binding-config - 1.0-SNAPSHOT org.opendaylight.controller sal-binding-broker-impl - 1.0-SNAPSHOT org.opendaylight.controller sal-broker-impl - 1.0-SNAPSHOT org.opendaylight.controller.model model-inventory - 1.0-SNAPSHOT org.opendaylight.yangtools @@ -367,24 +316,20 @@ org.opendaylight.controller sal-connector-api - 1.0-SNAPSHOT org.opendaylight.controller sal-common-util - 1.0-SNAPSHOT org.opendaylight.controller clustering.services - 0.4.1-SNAPSHOT equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 @@ -408,19 +353,16 @@ org.zeromq jeromq - 0.3.1 org.opendaylight.yangtools.thirdparty xtend-lib-osgi - 2.4.3 test org.opendaylight.controller sal-binding-broker-impl - 1.0-SNAPSHOT provided @@ -478,23 +420,19 @@ equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 test org.slf4j log4j-over-slf4j - 1.7.2 ch.qos.logback logback-core - 1.0.9 ch.qos.logback logback-classic - 1.0.9 org.mockito @@ -504,13 +442,11 @@ org.opendaylight.controller.model model-flow-service - 1.0-SNAPSHOT provided org.opendaylight.controller config-manager - 0.2.3-SNAPSHOT commons-io @@ -521,13 +457,11 @@ org.opendaylight.controller.model model-flow-management - 1.0-SNAPSHOT provided org.opendaylight.yangtools.thirdparty antlr4-runtime-osgi-nohead - 4.0 diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml index b041cb430a..b681db27fb 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-nb/pom.xml @@ -59,37 +59,30 @@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT org.opendaylight.controller sal - 0.5.1-SNAPSHOT org.opendaylight.controller.tests sal-remoterpc-connector-test-provider - 1.0-SNAPSHOT org.opendaylight.controller.tests sal-remoterpc-connector-test-consumer - 1.0-SNAPSHOT org.opendaylight.controller sal-remoterpc-connector - 1.0-SNAPSHOT org.osgi org.osgi.core - 5.0.0 junit @@ -98,7 +91,6 @@ org.opendaylight.controller remoterpc-routingtable.implementation - 0.4.1-SNAPSHOT com.google.guava diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml index c2d245badb..46f4a2366a 100644 --- a/opendaylight/md-sal/sal-rest-connector/pom.xml +++ b/opendaylight/md-sal/sal-rest-connector/pom.xml @@ -17,7 +17,6 @@ ${project.groupId} sal-core-api - 1.1-SNAPSHOT com.google.code.gson @@ -62,7 +61,6 @@ org.jboss.resteasy jaxrs-api - 3.0.4.Final provided @@ -80,7 +78,6 @@ org.glassfish.jersey.test-framework.providers jersey-test-framework-provider-grizzly2 - 2.4 test diff --git a/opendaylight/md-sal/sal-rest-docgen/pom.xml b/opendaylight/md-sal/sal-rest-docgen/pom.xml index 79a3434c49..0c8b4d5a2a 100644 --- a/opendaylight/md-sal/sal-rest-docgen/pom.xml +++ b/opendaylight/md-sal/sal-rest-docgen/pom.xml @@ -36,8 +36,6 @@ org.apache.commons commons-lang3 - 3.3.2 - diff --git a/opendaylight/md-sal/samples/l2switch/implementation/pom.xml b/opendaylight/md-sal/samples/l2switch/implementation/pom.xml index 10a9d6ddad..8824284785 100644 --- a/opendaylight/md-sal/samples/l2switch/implementation/pom.xml +++ b/opendaylight/md-sal/samples/l2switch/implementation/pom.xml @@ -32,7 +32,6 @@ org.opendaylight.controller.model model-topology - 1.1-SNAPSHOT org.opendaylight.controller.samples.l2switch.md diff --git a/opendaylight/md-sal/samples/toaster-it/pom.xml b/opendaylight/md-sal/samples/toaster-it/pom.xml index 2fcb2f6d63..56ed9a07a6 100644 --- a/opendaylight/md-sal/samples/toaster-it/pom.xml +++ b/opendaylight/md-sal/samples/toaster-it/pom.xml @@ -21,18 +21,15 @@ org.opendaylight.controller.samples sample-toaster - 1.1-SNAPSHOT org.opendaylight.controller.samples sample-toaster-consumer - 1.1-SNAPSHOT org.opendaylight.controller.samples sample-toaster-provider - 1.1-SNAPSHOT org.openexi @@ -50,7 +47,6 @@ equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 test @@ -72,7 +68,6 @@ org.ops4j.pax.exam maven-paxexam-plugin - 1.2.4 generate-config diff --git a/opendaylight/md-sal/topology-lldp-discovery/pom.xml b/opendaylight/md-sal/topology-lldp-discovery/pom.xml index a51f6c2f9f..2c8571ca64 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/pom.xml +++ b/opendaylight/md-sal/topology-lldp-discovery/pom.xml @@ -28,7 +28,6 @@ commons-lang commons-lang - 2.4 equinoxSDK381 diff --git a/opendaylight/md-sal/topology-manager/pom.xml b/opendaylight/md-sal/topology-manager/pom.xml index 55244d3c90..fe1813a199 100644 --- a/opendaylight/md-sal/topology-manager/pom.xml +++ b/opendaylight/md-sal/topology-manager/pom.xml @@ -34,7 +34,6 @@ org.opendaylight.controller.model model-topology - 1.1-SNAPSHOT org.osgi