From c04206a0d20db82417ebe9ede37441c6d9681cd3 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 11 Jan 2019 11:08:07 -0500 Subject: [PATCH] Break dependency loop Removed import of CCSDK repo artifact BOMs from parent poms to break a dependency loop. Including those meant that, when rolling to a new release version, we'd have to touch parent twice: first, with the 'old' version of CCDSK repos (since they're not built yet), and then after they're built, we'd have to update parent poms to import the rolled-version of the repo BOMs. And after that, we'd need to re-merge all the repos, so that they are compiled against the correct version of sli core. Change-Id: Id10c29e3f321defb1b911de894cf045693ef90cc Issue-ID: CCSDK-939 Signed-off-by: Timoney, Dan (dt5972) --- odlparent/binding-parent/pom.xml | 39 +++------------------- odlparent/bundle-parent/pom.xml | 39 +++------------------- odlparent/feature-repo-parent/pom.xml | 39 +++------------------- odlparent/mdsal-it-parent/pom.xml | 39 +++------------------- odlparent/odlparent-lite/pom.xml | 39 +++------------------- odlparent/odlparent/pom.xml | 39 +++------------------- .../setup/src/main/resources/pom-template.xml | 39 +++------------------- odlparent/single-feature-parent/pom.xml | 39 +++------------------- 8 files changed, 40 insertions(+), 272 deletions(-) diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index fbad0cb3..2316155b 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - ${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - ${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - ${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index e44057dd..c72d87fe 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - ${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - ${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - ${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 33bf0334..d0a65936 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - ${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - ${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - ${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 777dd173..3347e845 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - ${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - ${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - ${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 6a4030f1..475f397f 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - ${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - ${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - ${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 9a214474..50b9713e 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - ${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - ${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - ${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index adc24ab4..cc038a89 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT \${ccsdk.sli.core.version} \${ccsdk.sli.adaptors.version} \${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - \${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - \${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - \${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - \${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 1c137c94..f27461cb 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -93,11 +93,11 @@ - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT - 0.4.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -532,35 +532,6 @@ pom import - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - - org.onap.ccsdk.sli.adaptors - sli-adaptors-artifacts - ${ccsdk.sli.adaptors.version} - pom - import - - - org.onap.ccsdk.sli.northbound - sli-northbound-artifacts - ${ccsdk.sli.northbound.version} - pom - import - - - org.onap.ccsdk.sli.plugins - sli-plugins-artifacts - ${ccsdk.sli.plugins.version} - pom - import - - org.opendaylight.controller -- 2.16.6