From e787c2e8a2d43ea0780e85b436c31630832877b1 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 6 Mar 2020 10:25:18 -0500 Subject: [PATCH] Roll master to Guilin Roll master to new versions for early Guilin developent Change-Id: I7cadbf176e87b8fe4a62f54d5d6d8f99921a449c Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- alpine/pom.xml | 4 ++-- ansible-server/pom.xml | 4 ++-- dependencies/pom.xml | 4 ++-- dgbuilder-docker/pom.xml | 4 ++-- dgbuilder/pom.xml | 4 ++-- odlsli/odlsli-alpine/pom.xml | 7 +++---- odlsli/pom.xml | 4 ++-- opendaylight/neon/neon-alpine/pom.xml | 4 ++-- opendaylight/neon/pom.xml | 4 ++-- opendaylight/pom.xml | 4 ++-- platform-logic/a1Adapter-api/pom.xml | 4 ++-- platform-logic/asdc-api/pom.xml | 4 ++-- platform-logic/cMNotify-api/pom.xml | 4 ++-- platform-logic/installer/pom.xml | 4 ++-- platform-logic/oofpcipoc-api/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- platform-logic/restapi-templates/pom.xml | 4 ++-- platform-logic/sliapi/pom.xml | 4 ++-- pom.xml | 4 ++-- saltstack-server/pom.xml | 4 ++-- ubuntu/pom.xml | 4 ++-- version.properties | 6 +++--- 22 files changed, 46 insertions(+), 47 deletions(-) diff --git a/alpine/pom.xml b/alpine/pom.xml index 490c2bf0..38626923 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT distribution-alpine - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: alpine diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index bb5192e8..7d0a3e3d 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -4,14 +4,14 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT 4.0.0 pom org.onap.ccsdk.distribution ansible-server - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT ccsdk :: distribution :: ${project.artifactId} Creates ansible-server Docker container diff --git a/dependencies/pom.xml b/dependencies/pom.xml index da681ba7..cbb83198 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.distribution dependencies - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution:: dependencies diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index ec9d15c7..f969e5bf 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder-docker - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: dgbuilder-docker diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 3a1ec4de..5edc91c7 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: dgbuilder diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index c3d0f0f6..20128773 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -1,18 +1,17 @@ - + 4.0.0 org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.distribution distribution-odlsli-alpine - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: odlsli-alpine diff --git a/odlsli/pom.xml b/odlsli/pom.xml index c572198c..75343cc4 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT distribution-odlsli - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: odlsli diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml index 1dfb3b20..2fb3604a 100644 --- a/opendaylight/neon/neon-alpine/pom.xml +++ b/opendaylight/neon/neon-alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-odl-neon - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT distribution-odl-neon-docker - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: opendaylight :: neon :: docker diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml index f1793543..caa22821 100644 --- a/opendaylight/neon/pom.xml +++ b/opendaylight/neon/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-opendaylight - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT distribution-odl-neon - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: opendaylight diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 4d48f4d7..4ed68858 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT distribution-opendaylight - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: opendaylight diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index a359deea..e302aa73 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT platform-logic-a1Adapterapi - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 0e685c51..eb7a58fd 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT platform-logic-asdcapi - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index 426e4bac..46c5b998 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT platform-logic-cMNotifyai - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 598c46d6..0221bac3 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT platform-logic-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index 68347f1c..e35bf52c 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT platform-logic-oofpcipocapi - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 8b243ea7..26362321 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index f1063085..182cca66 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT platform-logic-restapi-templates - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index 98440d74..1d286cb1 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT platform-logic-sliapi - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 3bde37c3..10d48a60 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index 75f0bcc8..cd4acee5 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT saltstack-server - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 31ff0108..c81722b2 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT distribution-ubuntu - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom ccsdk-distribution :: ubuntu diff --git a/version.properties b/version.properties index b05a161f..1da7b9a3 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} -- 2.16.6