From 14d404adde17e3c94bf0bd602817ac6efc8244eb Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Wed, 9 Aug 2017 10:30:04 -0400 Subject: [PATCH] Remove config-parent derivation This is a follow-up to https://git.opendaylight.org/gerrit/#/c/60595/ to remove the remaining CSS remnants. Change-Id: I8a454e0ffc1a796f9b946d4ec8542ece8913d81d Signed-off-by: Tom Pantelis --- domain-extensions/pom.xml | 18 ++++++++++--- groupbasedpolicy/pom.xml | 27 ++++++++++++++++--- location-providers/pom.xml | 23 +++++++++++++--- neutron-mapper/pom.xml | 23 +++++++++++++--- neutron-ovsdb/pom.xml | 18 ++++++++++--- neutron-vpp-mapper/pom.xml | 23 +++++++++++++--- renderers/pom.xml | 5 ++++ .../ip-sgt-distribution-service/pom.xml | 13 ++++++--- sxp-integration/pom.xml | 19 ++++++++++--- 9 files changed, 145 insertions(+), 24 deletions(-) diff --git a/domain-extensions/pom.xml b/domain-extensions/pom.xml index 3d3a71e1f..dfaf9f4e0 100644 --- a/domain-extensions/pom.xml +++ b/domain-extensions/pom.xml @@ -8,9 +8,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -26,6 +26,18 @@ l2-l3 + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + + org.opendaylight.groupbasedpolicy diff --git a/groupbasedpolicy/pom.xml b/groupbasedpolicy/pom.xml index 4f5df0617..b7bcfebc4 100755 --- a/groupbasedpolicy/pom.xml +++ b/groupbasedpolicy/pom.xml @@ -8,9 +8,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -22,7 +22,23 @@ build failure. Please do not modify this unless you have a good reason. --> ODL :: groupbasedpolicy :: ${project.artifactId} + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + + + + org.opendaylight.controller + sal-binding-api + org.opendaylight.mdsal.model @@ -77,6 +93,11 @@ test-jar test + + org.opendaylight.controller + sal-binding-broker-impl + test + org.opendaylight.controller.model model-inventory diff --git a/location-providers/pom.xml b/location-providers/pom.xml index a473958a6..9016f5e54 100644 --- a/location-providers/pom.xml +++ b/location-providers/pom.xml @@ -8,9 +8,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -26,11 +26,28 @@ ne-location-provider + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + + org.opendaylight.groupbasedpolicy groupbasedpolicy ${project.version} + + org.opendaylight.controller + sal-binding-broker-impl + test + diff --git a/neutron-mapper/pom.xml b/neutron-mapper/pom.xml index c97a96b44..a8f68b634 100644 --- a/neutron-mapper/pom.xml +++ b/neutron-mapper/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -27,6 +27,18 @@ 0.9.0-SNAPSHOT + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + + @@ -57,6 +69,11 @@ test-jar test + + org.opendaylight.controller + sal-binding-broker-impl + test + org.opendaylight.mdsal.model ietf-yang-types-20130715 diff --git a/neutron-ovsdb/pom.xml b/neutron-ovsdb/pom.xml index 61acbe8a1..ef63dadc9 100644 --- a/neutron-ovsdb/pom.xml +++ b/neutron-ovsdb/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -27,6 +27,18 @@ 1.5.0-SNAPSHOT + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + + diff --git a/neutron-vpp-mapper/pom.xml b/neutron-vpp-mapper/pom.xml index c9df1fa0c..a85421d03 100644 --- a/neutron-vpp-mapper/pom.xml +++ b/neutron-vpp-mapper/pom.xml @@ -9,9 +9,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -27,6 +27,18 @@ 0.9.0-SNAPSHOT + + + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + + + + @@ -65,6 +77,11 @@ test-jar test + + org.opendaylight.controller + sal-binding-broker-impl + test + org.opendaylight.mdsal.model ietf-yang-types-20130715 diff --git a/renderers/pom.xml b/renderers/pom.xml index e3cfe663a..d8261f56e 100644 --- a/renderers/pom.xml +++ b/renderers/pom.xml @@ -70,5 +70,10 @@ org.opendaylight.groupbasedpolicy groupbasedpolicy + + org.opendaylight.controller + sal-binding-broker-impl + test + diff --git a/sxp-integration/ip-sgt-distribution-service/pom.xml b/sxp-integration/ip-sgt-distribution-service/pom.xml index 062a86019..f9547ca7b 100644 --- a/sxp-integration/ip-sgt-distribution-service/pom.xml +++ b/sxp-integration/ip-sgt-distribution-service/pom.xml @@ -7,9 +7,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -27,6 +27,13 @@ + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + org.opendaylight.sxp sxp-core diff --git a/sxp-integration/pom.xml b/sxp-integration/pom.xml index dc4cfa570..1db687d6b 100644 --- a/sxp-integration/pom.xml +++ b/sxp-integration/pom.xml @@ -8,9 +8,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.7.0-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.11.0-SNAPSHOT @@ -34,6 +34,13 @@ + + org.opendaylight.controller + mdsal-artifacts + 1.6.0-SNAPSHOT + pom + import + org.opendaylight.groupbasedpolicy groupbasedpolicy-artifacts @@ -66,5 +73,11 @@ mdsal-binding-dom-codec ${mdsalmodel.version} + + org.opendaylight.controller + sal-binding-broker-impl + test-jar + test + -- 2.36.6