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 --- northbound/features/ccsdk-asdcApi/pom.xml | 7 +++---- northbound/features/ccsdk-daexim-offsite-backup/pom.xml | 7 +++---- northbound/features/ccsdk-dataChange/pom.xml | 7 +++---- northbound/features/ccsdk-lcm/pom.xml | 7 +++---- northbound/features/ccsdk-sli-northbound-all/pom.xml | 7 +++---- northbound/features/features-sli-northbound/pom.xml | 2 +- northbound/features/installer/pom.xml | 7 +++---- northbound/features/pom.xml | 4 ++-- 8 files changed, 21 insertions(+), 27 deletions(-) (limited to 'northbound/features') diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 799d499c7..c33a2ce8a 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 932c55aa2..31f6010df 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index 4d6aec730..0f6850768 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index aef5e161a..cde3cc8f5 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 75675e3bb..6302aacf4 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - single-feature-parent - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 6afb797d0..77b6e2f62 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index be23e6011..f175832a1 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.sli.northbound + slinorthbound-feature-aggregator + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 69825084f..7f59f5824 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -4,8 +4,8 @@ org.onap.ccsdk.parent - odlparent-lite - 2.1.0 + single-feature-parent + 2.1.1-SNAPSHOT -- cgit 1.2.3-korg