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/artifacts/pom.xml | 7 ++-- core/dblib/installer/pom.xml | 7 ++-- core/dblib/pom.xml | 7 ++-- core/dblib/provider/pom.xml | 7 ++-- 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 ++- core/filters/installer/pom.xml | 7 ++-- core/filters/pom.xml | 7 ++-- core/filters/provider/pom.xml | 12 ++++--- core/pom.xml | 53 +++++++++++++++--------------- core/sli/common/pom.xml | 7 ++-- core/sli/installer/pom.xml | 7 ++-- core/sli/model/pom.xml | 2 +- core/sli/pom.xml | 7 ++-- core/sli/provider-base/pom.xml | 7 ++-- core/sli/provider/pom.xml | 2 +- core/sliPluginUtils/installer/pom.xml | 7 ++-- core/sliPluginUtils/pom.xml | 7 ++-- core/sliPluginUtils/provider/pom.xml | 7 ++-- core/sliapi/installer/pom.xml | 7 ++-- core/sliapi/model/pom.xml | 7 ++-- core/sliapi/model/swagger/pom.xml | 6 ++-- core/sliapi/model/yang/pom.xml | 2 +- core/sliapi/pom.xml | 7 ++-- core/sliapi/provider/pom.xml | 2 +- core/utils/installer/pom.xml | 7 ++-- core/utils/pom.xml | 7 ++-- core/utils/provider/pom.xml | 10 +++--- 36 files changed, 126 insertions(+), 152 deletions(-) (limited to 'core') diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 7a4252148..25990a35a 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index b97d11cfd..40f6bfbca 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/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 + dblib + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index efe43e1ae..81edb0ffa 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index 224f53aff..d4f26b504 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + dblib + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core 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 diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index 56a8692bc..c94c18834 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/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 + filters + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 9549ccd16..42d40fc1a 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index 657e50022..6b2dabe29 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + filters + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core @@ -25,5 +24,10 @@ javax.servlet javax.servlet-api + + junit + junit + test + diff --git a/core/pom.xml b/core/pom.xml index d53f5a8bc..d74d84b8a 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,14 +3,13 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli + sli-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core - ccsdk-sli-core + core-root 1.2.0-SNAPSHOT pom @@ -22,7 +21,7 @@ - utils + utils dblib sli filters @@ -58,27 +57,27 @@ - - - com.blackducksoftware.integration - hub-maven-plugin - 1.4.0 - false - - ${project.name} - ${project.basedir} - - - - create-bdio-file - package - - createHubOutput - - - - - + + + com.blackducksoftware.integration + hub-maven-plugin + 1.4.0 + false + + ${project.name} + ${project.basedir} + + + + create-bdio-file + package + + createHubOutput + + + + + diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index 748488bb2..62b7e550f 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sli + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index 02b5c1ddc..2a9a8da5e 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/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 + sli + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index fbdb982f4..acff5263f 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/sli/pom.xml b/core/sli/pom.xml index 74873649a..3cb835b26 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index 671c0610f..5eac2c760 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sli + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index 7ad437d47..1fde267e8 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index f6f4d5588..11aa73c85 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/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 + sliPluginUtils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 4974d0003..971daed62 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 393d982e4..63deccadd 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sliPluginUtils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index 5e11a3609..c442b052c 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/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 + sliapi + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index 20075e1e0..5c4425218 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + sliapi + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index eaa6d6039..dccfbc0a6 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -3,9 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - oparent - 2.1.0-SNAPSHOT + org.onap.ccsdk.sli.core + sliapi-model + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index 3a443e0e9..8e92af9da 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 8a8602ae5..789789624 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index 447c6ef0f..b9d1c9a67 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.0-SNAPSHOT + 2.1.1-SNAPSHOT diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index 80e4072f8..17bbbcf54 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/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 + utils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/utils/pom.xml b/core/utils/pom.xml index a204f8175..d2fe753af 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + core-root + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 8d3a785f4..02bf84d0c 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -3,10 +3,9 @@ 4.0.0 - org.onap.ccsdk.parent - binding-parent - 2.1.0-SNAPSHOT - + org.onap.ccsdk.sli.core + utils + 1.2.0-SNAPSHOT org.onap.ccsdk.sli.core @@ -31,7 +30,7 @@ org.osgi org.osgi.core provided - + @@ -42,7 +41,6 @@ junit junit - ${junit.version} test -- cgit 1.2.3-korg