From 5de81966f5574ae83e85aa7d5aa8865ea5deef24 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 26 Jan 2021 13:15:47 -0500 Subject: Revert "Limit use of odlparent poms" This reverts commit 7de29bfea89ff53a446bea07d8f74d1aaa87045b, due to issues encountered in the odlsli container in ccsdk/distribution. Issue-ID: CCSDK-3001 Issue-ID: CCSDK-3099 Change-Id: I79252b74693895f483eb390c575bb244195fe7ed 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/installer/pom.xml | 7 ++-- core/features/pom.xml | 3 +- 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/pom.xml | 7 ++-- core/sli/provider-base/pom.xml | 7 ++-- 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/pom.xml | 7 ++-- core/utils/installer/pom.xml | 7 ++-- core/utils/pom.xml | 7 ++-- core/utils/provider/pom.xml | 10 +++--- 31 files changed, 146 insertions(+), 120 deletions(-) (limited to 'core') diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 25990a35a..e8577257e 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - core-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 40f6bfbca..ea0b537e7 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - dblib - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index 81edb0ffa..b3ea4fd79 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - core-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index d4f26b504..d976e551b 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - dblib - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 469b94484..f1164017a 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + single-feature-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index bce946f80..3be459e99 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + single-feature-parent + 2.1.1-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 5fd7cbc5c..11d0dca31 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + single-feature-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 70d712b6a..c6fcfc808 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + single-feature-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index b27d49c08..a4c9b7014 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + single-feature-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index bb5218103..25ea6c1d0 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + single-feature-parent + 2.1.1-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 25e5a184e..7a4966d40 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + single-feature-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 41e09ca49..51b8fcd97 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - slicore-feature-aggregator - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/features/pom.xml b/core/features/pom.xml index 8fab8d638..9a93bda37 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -4,8 +4,9 @@ org.onap.ccsdk.parent - single-feature-parent + odlparent-lite 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index c94c18834..a550293d6 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - filters - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 42d40fc1a..e2cc34e59 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - core-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index 6b2dabe29..3dd4f5bb8 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - filters - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core @@ -24,10 +25,5 @@ javax.servlet javax.servlet-api - - junit - junit - test - diff --git a/core/pom.xml b/core/pom.xml index d74d84b8a..a80158872 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,13 +3,14 @@ 4.0.0 - org.onap.ccsdk.sli - sli-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core - core-root + ccsdk-sli-core 1.2.0-SNAPSHOT pom @@ -21,7 +22,7 @@ - utils + utils dblib sli filters @@ -57,27 +58,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 62b7e550f..34db3104c 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - sli - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index 2a9a8da5e..4ef1a548d 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - sli - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sli/pom.xml b/core/sli/pom.xml index 3cb835b26..bf0d52fce 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - core-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index 5eac2c760..fac9a7796 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - sli - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index 11aa73c85..63dd074ba 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - sliPluginUtils - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 971daed62..b02e5c5ab 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - core-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 63deccadd..7312003bb 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - sliPluginUtils - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index c442b052c..8a3b501d7 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - sliapi - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index 5c4425218..de1a46fa2 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - sliapi - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index dccfbc0a6..1b8d1a0cb 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.sli.core - sliapi-model - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + oparent + 2.1.1-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 789789624..2c5d83370 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - core-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index 17bbbcf54..8df51194c 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - utils - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/utils/pom.xml b/core/utils/pom.xml index d2fe753af..a770da6b5 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - core-root - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + odlparent-lite + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 02bf84d0c..e3a805f82 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -3,9 +3,10 @@ 4.0.0 - org.onap.ccsdk.sli.core - utils - 1.2.0-SNAPSHOT + org.onap.ccsdk.parent + binding-parent + 2.1.1-SNAPSHOT + org.onap.ccsdk.sli.core @@ -30,7 +31,7 @@ org.osgi org.osgi.core provided - + @@ -41,6 +42,7 @@ junit junit + ${junit.version} test -- cgit 1.2.3-korg