From 03c6d7620f636a5ab23c91c4aa2d07c5a24b3b84 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 18 Mar 2020 09:30:59 -0400 Subject: [PATCH] Roll to Guilin release snapshot Roll master branch to Guilin release numbering Change-Id: I273a6d07c7a42dd1bde4219fada701da51c40bf0 Issue-ID: SDNC-1110 Signed-off-by: Dan Timoney Former-commit-id: 0d6d9148fd35aec6a2f8ba72f6212570a37a73d3 --- SdncReports/SdncReportsApi/pom.xml | 4 ++-- SdncReports/SdncReportsDao/pom.xml | 4 ++-- SdncReports/pom.xml | 4 ++-- admportal/pom.xml | 4 ++-- configbackuprestore/getBackupVnfDetailService/pom.xml | 4 ++-- configbackuprestore/pom.xml | 4 ++-- configbackuprestore/vnfconfigbackupservice/pom.xml | 8 ++++---- configbackuprestore/vnfconfigreportsservice/pom.xml | 4 ++-- data-migrator/pom.xml | 4 ++-- installation/admportal/pom.xml | 4 ++-- installation/ansible-server/pom.xml | 4 ++-- installation/dmaap-listener/pom.xml | 4 ++-- installation/pom.xml | 4 ++-- installation/sdnc-web/pom.xml | 4 ++-- installation/sdnc/pom.xml | 4 ++-- installation/ueb-listener/pom.xml | 4 ++-- platform-logic/datachange/pom.xml | 4 ++-- platform-logic/generic-resource-api/pom.xml | 4 ++-- platform-logic/installer/pom.xml | 4 ++-- platform-logic/lcm/pom.xml | 4 ++-- platform-logic/optical-service/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- platform-logic/restapi-templates/pom.xml | 4 ++-- platform-logic/restconfapi-yang/pom.xml | 4 ++-- platform-logic/setup/pom.xml | 4 ++-- platform-logic/vnfapi/pom.xml | 4 ++-- pom.xml | 4 ++-- version.properties | 4 ++-- 28 files changed, 58 insertions(+), 58 deletions(-) diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index 669e5fed..b0e7c043 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -4,12 +4,12 @@ jar SdncReportsApi org.onap.sdnc.oam - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: SdncReports :: SdncReportsApi org.onap.sdnc.oam SdncReports - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index 19659d0c..5c959944 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.onap.sdnc.oam SdncReportsDao - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT jar sdnc-oam :: SdncReports :: SdncReportsDao @@ -11,7 +11,7 @@ org.onap.sdnc.oam SdncReports - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 136bde9d..56a73916 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.sdnc.oam SdncReports - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: SdncReports @@ -13,7 +13,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.5.2 + 2.0.0-SNAPSHOT diff --git a/admportal/pom.xml b/admportal/pom.xml index 3df4231a..35892390 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam admportal - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: admportal diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index ab5b08a3..b1e35c0e 100644 --- a/configbackuprestore/getBackupVnfDetailService/pom.xml +++ b/configbackuprestore/getBackupVnfDetailService/pom.xml @@ -4,11 +4,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: vnfbackup :: getBackupVnfDetailService http://maven.apache.org diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 0ca56d69..07916c0d 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,14 +5,14 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: vnfbackup pom org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.5.2 + 2.0.0-SNAPSHOT diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index 7d11c05d..70a9a80a 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -6,12 +6,12 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigbackupservice - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigbackupservice http://maven.apache.org @@ -20,13 +20,13 @@ org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml index a4cebc55..4cd0356a 100644 --- a/configbackuprestore/vnfconfigreportsservice/pom.xml +++ b/configbackuprestore/vnfconfigreportsservice/pom.xml @@ -4,11 +4,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigreportservice http://maven.apache.org diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml index 9c068f63..f9470a0c 100644 --- a/data-migrator/pom.xml +++ b/data-migrator/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam sdnc-oam - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.sdnc.oam data-migrator - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT jar sdnc-oam :: data-migrator diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index db2cddcb..9d72dd8a 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/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.sdnc.oam installation-admportal - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index e17e5c15..93ad5191 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ansible-server - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ansible-server Docker container diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 9363b406..e25f6f16 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-dmaap-listener - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container diff --git a/installation/pom.xml b/installation/pom.xml index cdc8dd68..3d814ed1 100644 --- a/installation/pom.xml +++ b/installation/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.sdnc.oam installation - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: installation Installs SDN-C on local file system diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index 037c4e98..3e81dc07 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam installation-sdnc-web - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: installation :: ${project.artifactId} diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 63d3a214..1f4ecd59 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/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.sdnc.oam installation-sdnc - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index dea6bb41..f6044ec9 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -4,13 +4,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT 4.0.0 pom org.onap.sdnc.oam installation-ueb-listener - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index 12c66a51..b37b9d96 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-datachange - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index b856cd54..2fb2528c 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-generic-resource-api - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 727816e1..8af947bb 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-installer - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index e8b0d711..c4cdc338 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-lcm - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/optical-service/pom.xml b/platform-logic/optical-service/pom.xml index 1025b3ae..47803bc8 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-optical-service - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 48454b54..477c6ac1 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 8120540e..41c64ef3 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restapi-templates - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index a31ea26e..cc3a931c 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restconfapi-yang - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 97576058..3fd2e9b2 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-setup - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 66d27735..3272c887 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.onap.sdnc.oam platform-logic-vnfapi - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index a19486c6..41672ecf 100755 --- 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.sdnc.oam sdnc-oam - 1.8.0-SNAPSHOT + 2.0.0-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index 9a2a5d84..99af217e 100644 --- a/version.properties +++ b/version.properties @@ -3,8 +3,8 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -release_name=1 -sprint_number=8 +release_name=2 +sprint_number=0 feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6