From 99889c1924876d65cf3402c5ddb299a7e4177aad Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 5 Mar 2020 11:48:38 -0500 Subject: Roll master to Guilin Roll versions of master for early Guilin development Change-Id: I9ad7859eb294120542bce6faadb83b383e963fa7 Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- artifacts/pom.xml | 15 +++++++-------- dblib/installer/pom.xml | 4 ++-- dblib/pom.xml | 4 ++-- dblib/provider/pom.xml | 4 ++-- features/ccsdk-dblib/pom.xml | 5 ++--- features/ccsdk-filters/pom.xml | 5 ++--- features/ccsdk-sli-core-all/pom.xml | 6 ++---- features/ccsdk-sli/pom.xml | 5 ++--- features/ccsdk-sliPluginUtils/pom.xml | 5 ++--- features/ccsdk-sliapi/pom.xml | 5 ++--- features/ccsdk-slicore-utils/pom.xml | 4 ++-- features/features-sli-core/pom.xml | 4 ++-- features/installer/pom.xml | 4 ++-- features/pom.xml | 4 ++-- filters/installer/pom.xml | 4 ++-- filters/pom.xml | 4 ++-- filters/provider/pom.xml | 6 +++--- pom.xml | 24 +++++++++++------------- sli/common/pom.xml | 5 ++--- sli/installer/pom.xml | 7 +++---- sli/model/pom.xml | 4 ++-- sli/pom.xml | 4 ++-- sli/provider-base/pom.xml | 8 ++------ sli/provider/pom.xml | 9 ++------- sliPluginUtils/installer/pom.xml | 5 ++--- sliPluginUtils/pom.xml | 4 ++-- sliPluginUtils/provider/pom.xml | 5 +++-- sliapi/installer/pom.xml | 6 +++--- sliapi/model/pom.xml | 4 ++-- sliapi/pom.xml | 4 ++-- sliapi/provider/pom.xml | 9 ++++----- sliapi/springboot/pom.xml | 4 ++-- utils/installer/pom.xml | 4 ++-- utils/pom.xml | 4 ++-- utils/provider/pom.xml | 4 ++-- version.properties | 6 +++--- 36 files changed, 93 insertions(+), 115 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a99345c82..cf6eb6b18 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -2,9 +2,15 @@ 4.0.0 + + org.onap.ccsdk.parent + parent + 2.0.0-SNAPSHOT + + org.onap.ccsdk.sli.core sli-core-artifacts - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: sli-core-artifacts @@ -14,12 +20,6 @@ ONAP - - org.onap.ccsdk.parent - parent - 1.5.2 - - @@ -148,5 +148,4 @@ - diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index 2b150e26f..59e143d2b 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core dblib-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: dblib :: ${project.artifactId} diff --git a/dblib/pom.xml b/dblib/pom.xml index 6cf7cee2b..af139d06d 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core dblib - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: dblib diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index 409f15000..edccd380b 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core dblib-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: dblib :: ${project.artifactId} diff --git a/features/ccsdk-dblib/pom.xml b/features/ccsdk-dblib/pom.xml index eea935575..83ec56756 100644 --- a/features/ccsdk-dblib/pom.xml +++ b/features/ccsdk-dblib/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-dblib - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: dblib :: ${project.artifactId} - diff --git a/features/ccsdk-filters/pom.xml b/features/ccsdk-filters/pom.xml index 8ba8c1c63..03fe524c5 100644 --- a/features/ccsdk-filters/pom.xml +++ b/features/ccsdk-filters/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-filters - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: filters :: ${project.artifactId} @@ -42,5 +42,4 @@ - diff --git a/features/ccsdk-sli-core-all/pom.xml b/features/ccsdk-sli-core-all/pom.xml index e58760019..192db84d3 100644 --- a/features/ccsdk-sli-core-all/pom.xml +++ b/features/ccsdk-sli-core-all/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-sli-core-all - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: features :: ${project.artifactId} - @@ -36,7 +35,6 @@ - ${project.groupId} diff --git a/features/ccsdk-sli/pom.xml b/features/ccsdk-sli/pom.xml index f32fd591d..c96b93c88 100644 --- a/features/ccsdk-sli/pom.xml +++ b/features/ccsdk-sli/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-sli - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: sli :: ${project.artifactId} - org.onap.ccsdk.sli.core diff --git a/features/ccsdk-sliPluginUtils/pom.xml b/features/ccsdk-sliPluginUtils/pom.xml index df843c041..8b9c67147 100644 --- a/features/ccsdk-sliPluginUtils/pom.xml +++ b/features/ccsdk-sliPluginUtils/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-sliPluginUtils - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} - diff --git a/features/ccsdk-sliapi/pom.xml b/features/ccsdk-sliapi/pom.xml index f7ffe28af..2dc873d67 100644 --- a/features/ccsdk-sliapi/pom.xml +++ b/features/ccsdk-sliapi/pom.xml @@ -5,18 +5,17 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-sliapi - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: sliapi :: ${project.artifactId} - diff --git a/features/ccsdk-slicore-utils/pom.xml b/features/ccsdk-slicore-utils/pom.xml index 929400655..200fc46ac 100644 --- a/features/ccsdk-slicore-utils/pom.xml +++ b/features/ccsdk-slicore-utils/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-slicore-utils - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: utils :: ${project.artifactId} diff --git a/features/features-sli-core/pom.xml b/features/features-sli-core/pom.xml index f524ca5de..019c3611f 100644 --- a/features/features-sli-core/pom.xml +++ b/features/features-sli-core/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core features-sli-core - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature ccsdk-sli-core :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 12fc962a5..3a7f0cd74 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core slicore-features-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index 9e927d47b..9408c0325 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core slicore-feature-aggregator - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: features diff --git a/filters/installer/pom.xml b/filters/installer/pom.xml index 3a90de580..bc0c56d12 100755 --- a/filters/installer/pom.xml +++ b/filters/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core filters-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: filters :: ${project.artifactId} diff --git a/filters/pom.xml b/filters/pom.xml index 73f1fa99e..3dec6563e 100644 --- a/filters/pom.xml +++ b/filters/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core filters - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: filters diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml index 4dc25a706..57d9387f8 100755 --- a/filters/provider/pom.xml +++ b/filters/provider/pom.xml @@ -5,17 +5,17 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core filters-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: filters :: ${project.artifactId} - + org.onap.logging-analytics diff --git a/pom.xml b/pom.xml index 6ce852711..2ad066f11 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core ccsdk-sli-core - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core @@ -20,10 +20,6 @@ ONAP - - - content/sites/site/org/onap/ccsdk/sli/core/${project.version}/ - utils @@ -42,7 +38,16 @@ ${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-core/browse sdnc-core-1.1.0 + + + ecomp-site + dav:${onap.nexus.url}/${sitePath} + + + + content/sites/site/org/onap/ccsdk/sli/core/${project.version}/ + @@ -123,11 +128,4 @@ - - - - ecomp-site - dav:${onap.nexus.url}/${sitePath} - - diff --git a/sli/common/pom.xml b/sli/common/pom.xml index d1dde52f6..5fb0b5ff0 100755 --- a/sli/common/pom.xml +++ b/sli/common/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sli-common - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: sli :: ${project.artifactId} @@ -23,7 +23,6 @@ - org.apache.derby diff --git a/sli/installer/pom.xml b/sli/installer/pom.xml index 5e5d099eb..3061253b3 100755 --- a/sli/installer/pom.xml +++ b/sli/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sli-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: sli :: ${project.artifactId} @@ -22,7 +22,7 @@ mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features false - + @@ -32,7 +32,6 @@ - diff --git a/sli/model/pom.xml b/sli/model/pom.xml index c330646cc..6951b89ca 100755 --- a/sli/model/pom.xml +++ b/sli/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sli-model - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: sli :: ${project.artifactId} diff --git a/sli/pom.xml b/sli/pom.xml index d21a6cfbc..b57f80e71 100755 --- a/sli/pom.xml +++ b/sli/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sli - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: sli diff --git a/sli/provider-base/pom.xml b/sli/provider-base/pom.xml index 8d59b507b..abd33b468 100644 --- a/sli/provider-base/pom.xml +++ b/sli/provider-base/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sli-provider-base - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT ccsdk-sli-core :: sli :: ${project.artifactId} @@ -29,7 +29,6 @@ - org.onap.ccsdk.sli.core @@ -61,7 +60,4 @@ - - - diff --git a/sli/provider/pom.xml b/sli/provider/pom.xml index eb3dc27d8..5dc327f16 100755 --- a/sli/provider/pom.xml +++ b/sli/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sli-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: sli :: ${project.artifactId} @@ -21,7 +21,6 @@ UTF-8 - @@ -31,7 +30,6 @@ - org.onap.ccsdk.sli.core @@ -108,7 +106,6 @@ * - @@ -134,7 +131,5 @@ - - diff --git a/sliPluginUtils/installer/pom.xml b/sliPluginUtils/installer/pom.xml index 0a3c62c3f..e877daf5c 100755 --- a/sliPluginUtils/installer/pom.xml +++ b/sliPluginUtils/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliPluginUtils-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} @@ -43,7 +43,6 @@ - diff --git a/sliPluginUtils/pom.xml b/sliPluginUtils/pom.xml index 85d232a5a..458941d27 100755 --- a/sliPluginUtils/pom.xml +++ b/sliPluginUtils/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliPluginUtils - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: sliPluginUtils diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml index a568e0abb..21ed4cd66 100755 --- a/sliPluginUtils/provider/pom.xml +++ b/sliPluginUtils/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliPluginUtils-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: sliPluginUtils :: ${project.artifactId} @@ -20,6 +20,7 @@ UTF-8 + diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml index 304e03580..7571e2dca 100755 --- a/sliapi/installer/pom.xml +++ b/sliapi/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliapi-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: sliapi :: ${project.artifactId} @@ -22,6 +22,7 @@ mvn:org.onap.ccsdk.sli.core/${features.boot}/${project.version}/xml/features false + @@ -42,7 +43,6 @@ - diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml index fee78a6fa..dfe7753a6 100755 --- a/sliapi/model/pom.xml +++ b/sliapi/model/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliapi-model - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: sliapi :: ${project.artifactId} diff --git a/sliapi/pom.xml b/sliapi/pom.xml index 585893057..e2c910801 100755 --- a/sliapi/pom.xml +++ b/sliapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliapi - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: sliapi diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml index 0ad2ce759..e726b24f2 100755 --- a/sliapi/provider/pom.xml +++ b/sliapi/provider/pom.xml @@ -5,18 +5,18 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliapi-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: sliapi :: ${project.artifactId} - - + + org.onap.ccsdk.sli.core @@ -25,7 +25,6 @@ - org.onap.ccsdk.sli.core diff --git a/sliapi/springboot/pom.xml b/sliapi/springboot/pom.xml index 602c20afc..dc2c16d6b 100644 --- a/sliapi/springboot/pom.xml +++ b/sliapi/springboot/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent spring-boot-starter-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core sliapi-springboot - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT jar ccsdk-sli-core :: sliapi :: ${project.artifactId} diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml index eb5dd0e82..e7380f0f6 100755 --- a/utils/installer/pom.xml +++ b/utils/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core utils-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: utils :: ${project.artifactId} diff --git a/utils/pom.xml b/utils/pom.xml index c1bfe1eac..85b18c68c 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core utils - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-sli-core :: utils diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml index 20cb30fc0..d5c07eba5 100644 --- a/utils/provider/pom.xml +++ b/utils/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.sli.core utils-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle ccsdk-sli-core :: utils :: ${project.artifactId} diff --git a/version.properties b/version.properties index b05a161f6..1da7b9a35 100644 --- a/version.properties +++ b/version.properties @@ -4,9 +4,9 @@ # because they are used in Jenkins, whose plug-in doesn't support -release_name=0 -sprint_number=7 -feature_revision=1 +release_name=1 +sprint_number=0 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg