From 7f5c3b36eac180f0505e9fab0504e7d6fe556828 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 19 Mar 2021 11:00:40 -0400 Subject: [PATCH] Roll to Istanbul release version Roll master to Istanbul release version Change-Id: I7da45e40569b80f5a1fff3146adef93966786095 Issue-ID: SDNC-1495 Signed-off-by: Dan Timoney Former-commit-id: 95737493d20a3ebfaba4235f4438cf6f21d99b48 --- SdncReports/pom.xml | 2 +- admportal/pom.xml | 2 +- configbackuprestore/pom.xml | 2 +- data-migrator/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 ++-- 22 files changed, 41 insertions(+), 41 deletions(-) diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 18ef44da..91c7f7f7 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/admportal/pom.xml b/admportal/pom.xml index c087b594..f8885292 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.1 + 2.2.0-SNAPSHOT diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 9c1e6d27..fd778ad9 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.1.1 + 2.2.0-SNAPSHOT org.onap.sdnc.oam.vnfbackup diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml index b258b484..45c7fd0f 100644 --- a/data-migrator/pom.xml +++ b/data-migrator/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam sdnc-oam - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam data-migrator - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT jar sdnc-oam :: data-migrator diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index b908fec2..9d2fec21 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam installation - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam installation-ansible-server - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: installation :: ${project.artifactId} diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 83a8c890..fc3f4923 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam installation - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam installation-dmaap-listener - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: installation :: ${project.artifactId} diff --git a/installation/pom.xml b/installation/pom.xml index 80dde977..d5fcd4d2 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam sdnc-oam - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam installation - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: installation diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index d2eec5e9..974241b9 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam installation - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam installation-sdnc-web - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: installation :: ${project.artifactId} diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index b9766dad..bc74b270 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam installation - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam installation-sdnc - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: installation :: ${project.artifactId} diff --git a/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 7559eb70..1119d3f7 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam installation - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam installation-ueb-listener - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: installation :: ${project.artifactId} diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index fc43fd7c..93d28603 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-datachange - 2.1.3-SNAPSHOT + 2.2.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 8e0c1256..b8097159 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-generic-resource-api - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 0541e523..0e5cba45 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-installer - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index ab0e40fd..5ab6d291 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-lcm - 2.1.3-SNAPSHOT + 2.2.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 b52ad8a3..54dd2870 100644 --- a/platform-logic/optical-service/pom.xml +++ b/platform-logic/optical-service/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-optical-service - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 8b46b351..91db7f65 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam sdnc-oam - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 5fdcd579..79139f9d 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restapi-templates - 2.1.3-SNAPSHOT + 2.2.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 029be635..e1775cb7 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-restconfapi-yang - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 53293edd..b9b2db0e 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-setup - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index 63b37d15..aad90bc9 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -5,12 +5,12 @@ org.onap.sdnc.oam platform-logic - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.sdnc.oam platform-logic-vnfapi - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 292abed2..0a937f79 100755 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.1 + 2.2.0-SNAPSHOT org.onap.sdnc.oam sdnc-oam - 2.1.3-SNAPSHOT + 2.2.0-SNAPSHOT pom sdnc-oam diff --git a/version.properties b/version.properties index fe27f3f0..a41e0285 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=2 -sprint_number=1 -feature_revision=3 +sprint_number=2 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6