From cadf660b585274ae01ec692dcc11439d73e3abf1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 16 Feb 2014 12:03:08 +0100 Subject: [PATCH] Fix warnings about overriden versions With proper parent structure, version overrides should not be present. Change-Id: I0a302cde1c619af76f9290f7e5ca5080ff4fe251 Signed-off-by: Robert Varga --- opendaylight/commons/opendaylight/pom.xml | 47 ++++++++ opendaylight/config/config-manager/pom.xml | 2 - .../pom.xml | 2 - .../pom.xml | 1 - .../netty-event-executor-config/pom.xml | 1 - .../config/netty-threadgroup-config/pom.xml | 1 - .../config/netty-timer-config/pom.xml | 3 - opendaylight/config/pom.xml | 3 +- opendaylight/config/yang-test/pom.xml | 1 - .../connectionmanager/implementation/pom.xml | 4 - .../distribution/opendaylight/pom.xml | 103 ++++-------------- .../implementation/pom.xml | 7 -- .../flow-management-compatibility/pom.xml | 5 - .../inventory-topology-compatibility/pom.xml | 8 -- opendaylight/md-sal/compatibility/pom.xml | 4 - .../compatibility/sal-compatibility/pom.xml | 3 - .../md-sal/forwardingrules-manager/pom.xml | 4 - opendaylight/md-sal/inventory-manager/pom.xml | 3 - .../model/model-flow-management/pom.xml | 1 - .../model/model-flow-statistics/pom.xml | 1 - .../md-sal/model/model-topology/pom.xml | 1 - opendaylight/md-sal/sal-binding-api/pom.xml | 3 - .../md-sal/sal-binding-broker/pom.xml | 31 ++---- .../md-sal/sal-binding-config/pom.xml | 2 - .../md-sal/sal-binding-dom-it/pom.xml | 5 - opendaylight/md-sal/sal-binding-it/pom.xml | 24 ---- opendaylight/md-sal/sal-binding-util/pom.xml | 1 - opendaylight/md-sal/sal-common-api/pom.xml | 2 - opendaylight/md-sal/sal-common-impl/pom.xml | 2 - opendaylight/md-sal/sal-common-util/pom.xml | 1 - opendaylight/md-sal/sal-connector-api/pom.xml | 1 - opendaylight/md-sal/sal-dom-api/pom.xml | 5 - opendaylight/md-sal/sal-dom-broker/pom.xml | 5 - opendaylight/md-sal/sal-dom-spi/pom.xml | 1 - .../md-sal/sal-netconf-connector/pom.xml | 8 -- .../md-sal/sal-rest-connector/pom.xml | 3 - .../md-sal/sal-restconf-broker/pom.xml | 2 - .../md-sal/samples/toaster-consumer/pom.xml | 1 - .../md-sal/samples/toaster-provider/pom.xml | 2 - .../md-sal/statistics-manager/pom.xml | 3 - .../md-sal/topology-lldp-discovery/pom.xml | 8 -- opendaylight/md-sal/topology-manager/pom.xml | 4 - opendaylight/netconf/netconf-ssh/pom.xml | 1 - opendaylight/netconf/netconf-util/pom.xml | 1 - .../northbound/connectionmanager/pom.xml | 1 - .../northbound/containermanager/pom.xml | 1 - .../northbound/controllermanager/pom.xml | 1 - .../northbound/flowprogrammer/pom.xml | 1 - opendaylight/northbound/hosttracker/pom.xml | 1 - opendaylight/northbound/java-client/pom.xml | 1 - .../networkconfiguration/bridgedomain/pom.xml | 1 - opendaylight/northbound/statistics/pom.xml | 1 - opendaylight/northbound/subnets/pom.xml | 2 - opendaylight/northbound/switchmanager/pom.xml | 1 - opendaylight/northbound/topology/pom.xml | 1 - opendaylight/northbound/usermanager/pom.xml | 1 - opendaylight/sal/implementation/pom.xml | 1 - .../samples/northbound/loadbalancer/pom.xml | 1 - 58 files changed, 76 insertions(+), 260 deletions(-) diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 93845a356d..0d74b99ce1 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -673,6 +673,11 @@ ietf-topology ${ietf-topology.version} + + org.opendaylight.yangtools.model + ietf-topology-l3-unicast-igp + ${ietf-topology.version} + org.opendaylight.yangtools.model opendaylight-l2-types @@ -694,6 +699,16 @@ concepts ${yangtools.version} + + org.opendaylight.yangtools + restconf-client-api + ${yangtools.version} + + + org.opendaylight.yangtools + restconf-client-impl + ${yangtools.version} + @@ -1204,6 +1219,13 @@ sal-binding-broker-impl ${mdsal.version} + + org.opendaylight.controller + sal-binding-broker-impl + ${mdsal.version} + test-jar + test + org.opendaylight.controller sal-compatibility @@ -1269,6 +1291,21 @@ statistics-manager ${mdsal.version} + + org.opendaylight.controller + sal-remote + ${mdsal.version} + + + org.opendaylight.controller + sal-restconf-broker + ${mdsal.version} + + + org.opendaylight.controller + sal-binding-util + ${mdsal.version} + org.opendaylight.controller concepts @@ -1405,6 +1442,16 @@ config-persister-impl ${netconf.version} + + ${project.groupId} + ietf-netconf-monitoring + ${netconf.version} + + + ${project.groupId} + ietf-netconf-monitoring-extension + ${netconf.version} + diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml index f50f7693ad..52377ae025 100644 --- a/opendaylight/config/config-manager/pom.xml +++ b/opendaylight/config/config-manager/pom.xml @@ -65,12 +65,10 @@ org.opendaylight.yangtools concepts - ${yangtools.version} org.opendaylight.yangtools yang-data-impl - ${yangtools.version} diff --git a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml index 301f00f768..92f7e27788 100644 --- a/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml +++ b/opendaylight/config/config-persister-directory-autodetect-adapter/pom.xml @@ -28,12 +28,10 @@ org.opendaylight.controller config-persister-directory-adapter - ${config.version} org.opendaylight.controller config-persister-directory-xml-adapter - ${config.version} diff --git a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml index 36fa530062..2c5d2359a0 100644 --- a/opendaylight/config/config-persister-directory-xml-adapter/pom.xml +++ b/opendaylight/config/config-persister-directory-xml-adapter/pom.xml @@ -28,7 +28,6 @@ org.opendaylight.controller config-persister-file-xml-adapter - ${config.version} diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index c1e0ccae31..88afa13155 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -24,7 +24,6 @@ org.opendaylight.controller netty-config-api - ${project.version} org.slf4j diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index 2e7777f91b..172fe7f1fc 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -26,7 +26,6 @@ org.opendaylight.controller netty-config-api - ${project.version} org.slf4j diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index 1e0c917032..9d3b5505ce 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -24,12 +24,10 @@ org.opendaylight.controller netty-config-api - ${project.version} org.opendaylight.controller threadpool-config-api - ${project.version} org.slf4j @@ -65,7 +63,6 @@ org.opendaylight.controller threadpool-config-impl - ${project.version} test diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 80621a4d44..3474740ca1 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -80,7 +80,6 @@ ch.qos.logback logback-classic - ${logback.version} test @@ -420,4 +419,4 @@ - \ No newline at end of file + diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml index 9c6e98e571..9037ff0c0f 100644 --- a/opendaylight/config/yang-test/pom.xml +++ b/opendaylight/config/yang-test/pom.xml @@ -106,7 +106,6 @@ org.opendaylight.yangtools yang-maven-plugin - ${yangtools.version} config diff --git a/opendaylight/connectionmanager/implementation/pom.xml b/opendaylight/connectionmanager/implementation/pom.xml index 7de43962cf..3bd7ea1386 100644 --- a/opendaylight/connectionmanager/implementation/pom.xml +++ b/opendaylight/connectionmanager/implementation/pom.xml @@ -54,22 +54,18 @@ org.opendaylight.controller clustering.services - 0.5.1-SNAPSHOT org.opendaylight.controller connectionmanager - 0.1.2-SNAPSHOT org.opendaylight.controller sal - 0.7.1-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.2-SNAPSHOT equinoxSDK381 diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index fca4936c7f..79b9ccea83 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -30,151 +30,123 @@ org.opendaylight.controller sal-common - ${mdsal.version} org.opendaylight.controller sal-common-util - ${mdsal.version} org.opendaylight.controller sal-netconf-connector - ${mdsal.version} org.opendaylight.controller sal-core-api - ${mdsal.version} org.opendaylight.controller sal-broker-impl - ${mdsal.version} - - org.opendaylight.controller - sal-remote - ${mdsal.version} - - org.opendaylight.controller - sal-restconf-broker - ${mdsal.version} + org.opendaylight.controller + sal-remote + + + org.opendaylight.controller + sal-restconf-broker org.opendaylight.controller sal-core-spi - ${mdsal.version} org.opendaylight.controller sal-common-api - ${mdsal.version} org.opendaylight.controller sal-common-impl - ${mdsal.version} org.opendaylight.controller sal-binding-api - ${mdsal.version} org.opendaylight.controller sal-binding-config - ${mdsal.version} org.opendaylight.controller sal-binding-broker-impl - ${mdsal.version} org.opendaylight.controller sal-compatibility - ${mdsal.version} org.opendaylight.controller sal-connector-api - ${mdsal.version} org.opendaylight.controller sal-rest-connector - ${mdsal.version} org.opendaylight.controller.model model-inventory - ${mdsal.version} org.opendaylight.controller.model model-flow-base - ${mdsal.version} org.opendaylight.controller.model model-flow-service - ${mdsal.version} org.opendaylight.controller.model model-flow-statistics - ${mdsal.version} org.opendaylight.controller.model model-flow-management - ${mdsal.version} org.opendaylight.controller.md inventory-manager - ${mdsal.version} org.opendaylight.controller.md forwardingrules-manager - ${mdsal.version} org.opendaylight.controller.md topology-lldp-discovery - ${mdsal.version} org.opendaylight.controller.md topology-manager - ${mdsal.version} - org.opendaylight.controller.model - model-topology - 1.1-SNAPSHOT + org.opendaylight.controller.model + model-topology + 1.1-SNAPSHOT org.opendaylight.yangtools.model ietf-topology - org.opendaylight.controller - sal-binding-util - 1.1-SNAPSHOT + org.opendaylight.controller + sal-binding-util org.opendaylight.controller.md statistics-manager - ${mdsal.version} org.opendaylight.controller concepts - ${concepts.version} org.opendaylight.controller @@ -183,147 +155,119 @@ org.opendaylight.yangtools concepts - ${yangtools.version} - - org.opendaylight.yangtools - restconf-client-api - ${yangtools.version} - - - org.opendaylight.yangtools - restconf-client-impl - ${yangtools.version} - + + org.opendaylight.yangtools + restconf-client-api + + + org.opendaylight.yangtools + restconf-client-impl + org.opendaylight.controller config-api - ${config.version} org.opendaylight.controller config-manager - ${config.version} org.opendaylight.controller yang-jmx-generator - ${config.version} org.opendaylight.controller yang-store-api - ${config.version} org.opendaylight.controller yang-store-impl - ${config.version} org.opendaylight.controller logback-config - ${config.version} org.opendaylight.controller config-persister-api - ${config.version} org.opendaylight.controller config-persister-file-adapter - ${config.version} org.opendaylight.controller config-persister-file-xml-adapter - ${config.version} org.opendaylight.controller config-persister-directory-adapter - ${config.version} org.opendaylight.controller config-persister-directory-xml-adapter - ${config.version} org.opendaylight.controller config-persister-directory-autodetect-adapter - ${config.version} org.opendaylight.controller shutdown-api - ${config.version} org.opendaylight.controller shutdown-impl - ${config.version} org.opendaylight.controller netconf-api - ${netconf.version} org.opendaylight.controller netconf-impl - ${netconf.version} org.opendaylight.controller netconf-util - ${netconf.version} org.opendaylight.controller netconf-client - ${netconf.version} org.opendaylight.controller netconf-mapping-api - ${netconf.version} org.opendaylight.controller netconf-ssh - ${netconf.version} org.opendaylight.controller config-netconf-connector - ${netconf.version} org.opendaylight.controller netconf-monitoring - ${netconf.version} ${project.groupId} ietf-netconf-monitoring - ${netconf.version} ${project.groupId} ietf-netconf-monitoring-extension - ${netconf.version} org.opendaylight.controller config-persister-impl - ${netconf.version} org.apache.servicemix.bundles @@ -340,35 +284,28 @@ org.opendaylight.controller threadpool-config-api - ${config.version} org.opendaylight.controller netty-config-api - ${config.version} org.opendaylight.controller threadpool-config-impl - ${config.version} org.opendaylight.controller netty-threadgroup-config - ${config.version} org.opendaylight.controller netty-event-executor-config - ${config.version} org.opendaylight.controller netty-timer-config - ${config.version} - org.opendaylight.controller.samples @@ -389,7 +326,6 @@ org.opendaylight.yangtools yang-binding - ${yangtools.version} org.opendaylight.yangtools @@ -445,7 +381,6 @@ org.opendaylight.yangtools yang-model-util - ${yangtools.version} org.opendaylight.yangtools diff --git a/opendaylight/forwardingrulesmanager/implementation/pom.xml b/opendaylight/forwardingrulesmanager/implementation/pom.xml index 8db8a0b8fd..f7bbdc14aa 100644 --- a/opendaylight/forwardingrulesmanager/implementation/pom.xml +++ b/opendaylight/forwardingrulesmanager/implementation/pom.xml @@ -72,12 +72,10 @@ org.opendaylight.controller configuration - 0.4.2-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.1-SNAPSHOT org.opendaylight.controller @@ -86,17 +84,14 @@ org.opendaylight.controller sal - 0.7.1-SNAPSHOT org.opendaylight.controller sal.connection - 0.1.2-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.1-SNAPSHOT equinoxSDK381 @@ -105,12 +100,10 @@ org.opendaylight.controller connectionmanager - 0.1.2-SNAPSHOT org.opendaylight.controller containermanager - 0.5.2-SNAPSHOT diff --git a/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml b/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml index 41db8af590..fc0ef32954 100644 --- a/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/flow-management-compatibility/pom.xml @@ -40,12 +40,10 @@ org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.slf4j @@ -72,17 +70,14 @@ org.opendaylight.controller.model model-flow-management - 1.1-SNAPSHOT org.opendaylight.controller forwardingrulesmanager - 0.5.1-SNAPSHOT org.opendaylight.controller sal-compatibility - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml index 46f1c4f57b..b7e193b59d 100644 --- a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/pom.xml @@ -41,22 +41,18 @@ org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller switchmanager - 0.7.1-SNAPSHOT org.opendaylight.controller topologymanager - 0.4.2-SNAPSHOT org.slf4j @@ -83,12 +79,10 @@ org.opendaylight.controller.model model-flow-management - 1.1-SNAPSHOT org.opendaylight.controller sal-binding-util - 1.1-SNAPSHOT org.opendaylight.controller.model @@ -98,12 +92,10 @@ org.opendaylight.controller forwardingrulesmanager - 0.5.1-SNAPSHOT org.opendaylight.controller sal-compatibility - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/compatibility/pom.xml b/opendaylight/md-sal/compatibility/pom.xml index 606cf212e5..c5c5cd32c5 100644 --- a/opendaylight/md-sal/compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/pom.xml @@ -25,22 +25,18 @@ org.opendaylight.controller sal - 0.7.1-SNAPSHOT org.opendaylight.controller.model model-flow-service - 1.1-SNAPSHOT org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT com.google.guava diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml b/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml index daef08949a..6914ef3c43 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml +++ b/opendaylight/md-sal/compatibility/sal-compatibility/pom.xml @@ -18,7 +18,6 @@ org.opendaylight.controller.model model-flow-statistics - 1.1-SNAPSHOT org.opendaylight.controller.model @@ -28,12 +27,10 @@ org.opendaylight.controller sal-binding-util - 1.1-SNAPSHOT org.opendaylight.controller clustering.services - 0.5.1-SNAPSHOT bundle diff --git a/opendaylight/md-sal/forwardingrules-manager/pom.xml b/opendaylight/md-sal/forwardingrules-manager/pom.xml index a949e45d67..00cbc18e7e 100644 --- a/opendaylight/md-sal/forwardingrules-manager/pom.xml +++ b/opendaylight/md-sal/forwardingrules-manager/pom.xml @@ -46,7 +46,6 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller @@ -56,12 +55,10 @@ org.opendaylight.controller.model model-flow-service - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-management - 1.1-SNAPSHOT org.opendaylight.yangtools @@ -70,7 +67,6 @@ org.opendaylight.controller sal-binding-broker-impl - 1.1-SNAPSHOT provided diff --git a/opendaylight/md-sal/inventory-manager/pom.xml b/opendaylight/md-sal/inventory-manager/pom.xml index ffdac63e4f..4d0465cba7 100644 --- a/opendaylight/md-sal/inventory-manager/pom.xml +++ b/opendaylight/md-sal/inventory-manager/pom.xml @@ -23,17 +23,14 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-service - 1.1-SNAPSHOT org.opendaylight.controller.model model-inventory - 1.1-SNAPSHOT org.eclipse.xtend diff --git a/opendaylight/md-sal/model/model-flow-management/pom.xml b/opendaylight/md-sal/model/model-flow-management/pom.xml index d81669532b..39f5060a32 100644 --- a/opendaylight/md-sal/model/model-flow-management/pom.xml +++ b/opendaylight/md-sal/model/model-flow-management/pom.xml @@ -29,7 +29,6 @@ org.opendaylight.yangtools.model opendaylight-l2-types - 2013.08.27.3 bundle diff --git a/opendaylight/md-sal/model/model-flow-statistics/pom.xml b/opendaylight/md-sal/model/model-flow-statistics/pom.xml index 13efc4c3ae..54f232234b 100644 --- a/opendaylight/md-sal/model/model-flow-statistics/pom.xml +++ b/opendaylight/md-sal/model/model-flow-statistics/pom.xml @@ -29,7 +29,6 @@ org.opendaylight.yangtools.model opendaylight-l2-types - 2013.08.27.3 bundle diff --git a/opendaylight/md-sal/model/model-topology/pom.xml b/opendaylight/md-sal/model/model-topology/pom.xml index cd44bd2472..8e9f623efc 100644 --- a/opendaylight/md-sal/model/model-topology/pom.xml +++ b/opendaylight/md-sal/model/model-topology/pom.xml @@ -20,7 +20,6 @@ org.opendaylight.controller.model model-inventory - 1.1-SNAPSHOT org.opendaylight.yangtools.model diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml index 86e14e4f56..f90031b205 100644 --- a/opendaylight/md-sal/sal-binding-api/pom.xml +++ b/opendaylight/md-sal/sal-binding-api/pom.xml @@ -26,18 +26,15 @@ org.opendaylight.controller sal-common - 1.1-SNAPSHOT org.opendaylight.controller sal-common-api - ${project.version} org.osgi org.osgi.core - ${osgi.core.version} provided diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index fd2c8a2fa4..5367498777 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -156,22 +156,18 @@ org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-common-impl - 1.1-SNAPSHOT org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller sal-binding-util - 1.1-SNAPSHOT org.slf4j @@ -180,7 +176,6 @@ org.osgi org.osgi.core - ${osgi.core.version} provided @@ -209,12 +204,10 @@ org.opendaylight.controller sal-core-api - 1.1-SNAPSHOT org.opendaylight.controller sal-broker-impl - 1.1-SNAPSHOT compile @@ -234,7 +227,6 @@ org.opendaylight.controller sal-binding-config - 1.1-SNAPSHOT org.opendaylight.yangtools @@ -253,28 +245,23 @@ org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.3 - org.opendaylight.yangtools.model - ietf-topology-l3-unicast-igp - 2013.10.21.1 - test + org.opendaylight.yangtools.model + ietf-topology-l3-unicast-igp + test - org.opendaylight.controller.model - model-flow-base - 1.1-SNAPSHOT + org.opendaylight.controller.model + model-flow-base - org.opendaylight.controller.model - model-flow-service - 1.1-SNAPSHOT + org.opendaylight.controller.model + model-flow-service - org.opendaylight.controller.model - model-flow-statistics - 1.1-SNAPSHOT + org.opendaylight.controller.model + model-flow-statistics diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml index d87e272032..cb71b4fd3a 100644 --- a/opendaylight/md-sal/sal-binding-config/pom.xml +++ b/opendaylight/md-sal/sal-binding-config/pom.xml @@ -100,12 +100,10 @@ org.opendaylight.controller config-api - 0.2.4-SNAPSHOT org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 8560848d5e..82e3d97572 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -52,31 +52,26 @@ org.ops4j.pax.exam pax-exam-container-native test - ${exam.version} org.opendaylight.controller sal-binding-broker-impl - 1.1-SNAPSHOT test org.opendaylight.controller sal-binding-broker-impl - 1.1-SNAPSHOT test-jar test org.opendaylight.controller.model model-flow-service - 1.1-SNAPSHOT test org.opendaylight.controller.model model-flow-management - 1.1-SNAPSHOT test diff --git a/opendaylight/md-sal/sal-binding-it/pom.xml b/opendaylight/md-sal/sal-binding-it/pom.xml index eaf5984c63..9bc8a48214 100644 --- a/opendaylight/md-sal/sal-binding-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-it/pom.xml @@ -19,9 +19,6 @@ ../sal-binding-broker/target/jacoco.exec ../sal-binding-broker/target/jacoco-it.exec - 0.2.4-SNAPSHOT - 0.2.4-SNAPSHOT - 2.5.0 @@ -145,71 +142,58 @@ org.opendaylight.controller sal-binding-broker-impl - 1.1-SNAPSHOT provided org.ops4j.pax.exam pax-exam-container-native - ${exam.version} test org.ops4j.pax.exam pax-exam-junit4 - ${exam.version} test org.opendaylight.controller config-netconf-connector - ${netconf.version} test org.opendaylight.controller yang-store-impl - ${config.version} org.opendaylight.controller logback-config - ${config.version} org.opendaylight.controller config-persister-impl - ${config.version} org.opendaylight.controller config-persister-file-xml-adapter - ${config.version} org.eclipse.persistence org.eclipse.persistence.moxy - ${moxy.controller.version} org.eclipse.persistence org.eclipse.persistence.core - ${moxy.controller.version} org.opendaylight.controller netconf-impl - ${netconf.version} org.opendaylight.controller netconf-monitoring - ${netconf.version} org.opendaylight.controller netconf-client - ${netconf.version} org.ops4j.pax.exam @@ -223,29 +207,24 @@ org.ops4j.pax.exam pax-exam-link-mvn - ${exam.version} 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.mockito @@ -255,18 +234,15 @@ org.opendaylight.controller.model model-flow-service - 1.1-SNAPSHOT provided org.opendaylight.controller config-manager - 0.2.4-SNAPSHOT org.opendaylight.controller.model model-flow-management - 1.1-SNAPSHOT provided diff --git a/opendaylight/md-sal/sal-binding-util/pom.xml b/opendaylight/md-sal/sal-binding-util/pom.xml index 747e4205e1..4842d8cf28 100644 --- a/opendaylight/md-sal/sal-binding-util/pom.xml +++ b/opendaylight/md-sal/sal-binding-util/pom.xml @@ -22,7 +22,6 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/sal-common-api/pom.xml b/opendaylight/md-sal/sal-common-api/pom.xml index 5dd08d062d..8a2571c727 100644 --- a/opendaylight/md-sal/sal-common-api/pom.xml +++ b/opendaylight/md-sal/sal-common-api/pom.xml @@ -17,7 +17,6 @@ org.opendaylight.controller sal-common - 1.1-SNAPSHOT org.opendaylight.yangtools @@ -30,7 +29,6 @@ org.osgi org.osgi.core - 5.0.0 bundle diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml index 46493ddad0..d3504bd018 100644 --- a/opendaylight/md-sal/sal-common-impl/pom.xml +++ b/opendaylight/md-sal/sal-common-impl/pom.xml @@ -18,12 +18,10 @@ org.opendaylight.controller sal-common-api - 1.1-SNAPSHOT org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT com.google.guava diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml index 3a9b00dce0..d3514ecc69 100644 --- a/opendaylight/md-sal/sal-common-util/pom.xml +++ b/opendaylight/md-sal/sal-common-util/pom.xml @@ -29,7 +29,6 @@ org.opendaylight.controller sal-common-api - ${project.version} diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml index f28057e8a6..14733bc6b5 100644 --- a/opendaylight/md-sal/sal-connector-api/pom.xml +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -17,7 +17,6 @@ org.opendaylight.controller sal-core-api - 1.1-SNAPSHOT org.opendaylight.yangtools diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml index d7b0296ce1..9c253eecb8 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/opendaylight/md-sal/sal-dom-api/pom.xml @@ -89,13 +89,10 @@ org.opendaylight.controller sal-common - 1.1-SNAPSHOT - org.opendaylight.controller config-api - 0.2.4-SNAPSHOT org.opendaylight.yangtools @@ -104,7 +101,6 @@ org.opendaylight.controller sal-common-api - ${project.version} org.opendaylight.yangtools @@ -113,7 +109,6 @@ org.osgi org.osgi.core - 5.0.0 bundle diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml index 8553d9eea5..d22b54ee19 100644 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ b/opendaylight/md-sal/sal-dom-broker/pom.xml @@ -18,22 +18,18 @@ org.opendaylight.controller sal-core-api - 1.1-SNAPSHOT org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT org.opendaylight.controller sal-common-impl - 1.1-SNAPSHOT org.opendaylight.controller sal-core-spi - 1.1-SNAPSHOT org.slf4j @@ -50,7 +46,6 @@ org.opendaylight.controller config-api - 0.2.4-SNAPSHOT org.opendaylight.yangtools diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml index 8aa2a006f6..e007ee7429 100644 --- a/opendaylight/md-sal/sal-dom-spi/pom.xml +++ b/opendaylight/md-sal/sal-dom-spi/pom.xml @@ -17,7 +17,6 @@ org.opendaylight.controller sal-core-api - 1.1-SNAPSHOT bundle diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml index 597b02ebb5..b060ca42d0 100644 --- a/opendaylight/md-sal/sal-netconf-connector/pom.xml +++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml @@ -33,7 +33,6 @@ org.opendaylight.controller netty-threadgroup-config - 0.2.4-SNAPSHOT org.opendaylight.controller @@ -146,7 +145,6 @@ org.opendaylight.controller logback-config test - ${netconf.version} org.mockito @@ -160,35 +158,29 @@ org.opendaylight.controller sal-binding-broker-impl - 1.1-SNAPSHOT test org.opendaylight.controller sal-binding-broker-impl - 1.1-SNAPSHOT test-jar test org.opendaylight.controller ietf-netconf-monitoring - 0.2.4-SNAPSHOT org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.3 org.opendaylight.controller threadpool-config-api - 0.2.4-SNAPSHOT org.opendaylight.controller netty-config-api - 0.2.4-SNAPSHOT diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml index a4d2f4ca25..cc3b0296ed 100644 --- a/opendaylight/md-sal/sal-rest-connector/pom.xml +++ b/opendaylight/md-sal/sal-rest-connector/pom.xml @@ -48,7 +48,6 @@ com.google.code.gson gson - 2.2.4 org.opendaylight.yangtools @@ -57,7 +56,6 @@ io.netty netty-codec-http - 4.0.10.Final @@ -74,7 +72,6 @@ ch.qos.logback logback-classic - 1.0.9 test diff --git a/opendaylight/md-sal/sal-restconf-broker/pom.xml b/opendaylight/md-sal/sal-restconf-broker/pom.xml index 8159707d57..2fe625ffb3 100644 --- a/opendaylight/md-sal/sal-restconf-broker/pom.xml +++ b/opendaylight/md-sal/sal-restconf-broker/pom.xml @@ -41,12 +41,10 @@ org.opendaylight.yangtools restconf-client-api - ${yangtools.version} org.opendaylight.yangtools restconf-client-impl - ${yangtools.version} org.slf4j diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index ff09c1dbf0..40e99ec28b 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -39,7 +39,6 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/samples/toaster-provider/pom.xml b/opendaylight/md-sal/samples/toaster-provider/pom.xml index 3f9ac737a2..ca1e3b4689 100644 --- a/opendaylight/md-sal/samples/toaster-provider/pom.xml +++ b/opendaylight/md-sal/samples/toaster-provider/pom.xml @@ -38,12 +38,10 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller sal-common-util - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/statistics-manager/pom.xml b/opendaylight/md-sal/statistics-manager/pom.xml index 5c3fc2329a..a9c1e05413 100644 --- a/opendaylight/md-sal/statistics-manager/pom.xml +++ b/opendaylight/md-sal/statistics-manager/pom.xml @@ -23,17 +23,14 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-statistics - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-base - 1.1-SNAPSHOT org.eclipse.xtend diff --git a/opendaylight/md-sal/topology-lldp-discovery/pom.xml b/opendaylight/md-sal/topology-lldp-discovery/pom.xml index 53cf2bd5c1..590e8ea91a 100644 --- a/opendaylight/md-sal/topology-lldp-discovery/pom.xml +++ b/opendaylight/md-sal/topology-lldp-discovery/pom.xml @@ -28,27 +28,22 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-service - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-base - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-management - 1.1-SNAPSHOT org.opendaylight.controller.model model-inventory - 1.1-SNAPSHOT org.eclipse.xtend @@ -57,7 +52,6 @@ equinoxSDK381 org.eclipse.osgi - 3.8.1.v20120830-144521 commons-lang @@ -71,12 +65,10 @@ commons-codec commons-codec - 1.7 org.opendaylight.controller sal - 0.7.1-SNAPSHOT diff --git a/opendaylight/md-sal/topology-manager/pom.xml b/opendaylight/md-sal/topology-manager/pom.xml index 3c676c8d8f..525ab9e4fe 100644 --- a/opendaylight/md-sal/topology-manager/pom.xml +++ b/opendaylight/md-sal/topology-manager/pom.xml @@ -23,22 +23,18 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT org.opendaylight.controller sal-binding-util - 1.1-SNAPSHOT org.opendaylight.controller.model model-flow-service - 1.1-SNAPSHOT org.opendaylight.controller.model model-inventory - 1.1-SNAPSHOT org.opendaylight.controller.model diff --git a/opendaylight/netconf/netconf-ssh/pom.xml b/opendaylight/netconf/netconf-ssh/pom.xml index 3b4125b386..efad2148e9 100644 --- a/opendaylight/netconf/netconf-ssh/pom.xml +++ b/opendaylight/netconf/netconf-ssh/pom.xml @@ -35,7 +35,6 @@ org.opendaylight.controller usermanager - 0.4.2-SNAPSHOT diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml index 0e06ab372f..e5bab5633b 100644 --- a/opendaylight/netconf/netconf-util/pom.xml +++ b/opendaylight/netconf/netconf-util/pom.xml @@ -45,7 +45,6 @@ io.netty netty-handler - ${netconf.netty.version}