From 7de29bfea89ff53a446bea07d8f74d1aaa87045b Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 25 Nov 2020 08:29:23 -0500 Subject: Limit use of odlparent poms Updated pom.xmls to use standard maven project structure (i.e. parent of pom is pom in directory above), and updated top level pom to use org.ccsdk.parent:oparent as parent - EXCEPT in cases where module has true OpenDaylight dependencies and therefore needs to use ODL parent pom. Change-Id: I50429f28225152251ac2086235c14bb00f09c05c Issue-ID: CCSDK-3001 Signed-off-by: Dan Timoney --- core/features/ccsdk-dblib/pom.xml | 7 +++---- core/features/ccsdk-filters/pom.xml | 7 +++---- core/features/ccsdk-sli-core-all/pom.xml | 7 +++---- core/features/ccsdk-sli/pom.xml | 7 +++---- core/features/ccsdk-sliPluginUtils/pom.xml | 7 +++---- core/features/ccsdk-sliapi/pom.xml | 7 +++---- core/features/ccsdk-slicore-utils/pom.xml | 7 +++---- core/features/features-sli-core/pom.xml | 2 +- core/features/installer/pom.xml | 7 +++---- core/features/pom.xml | 5 ++--- 10 files changed, 27 insertions(+), 36 deletions(-) (limited to 'core/features') diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 705309995..469b94484 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index 0a3f9afa3..bce946f80 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 984484e8c..5fd7cbc5c 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 5521d624b..70d712b6a 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index 04e76b445..b27d49c08 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index 3a026e2c9..bb5218103 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index bbba2b0d1..25e5a184e 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index e0502fe3f..96c56dece 100644 --- a/core/features/features-sli-core/pom.xml +++ b/core/features/features-sli-core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 53acc2686..41e09ca49 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + slicore-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/features/pom.xml b/core/features/pom.xml index 9018b1707..8fab8d638 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -4,9 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + single-feature-parent + 2.1.1-SNAPSHOT org.onap.ccsdk.sli.core -- cgit