From 129bbdb26de8dfc2f71bf12bbf5fabefa0d00fe9 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 9 Mar 2021 09:43:57 -0500 Subject: [PATCH] Roll master version for Istanbul Roll versions of ccsdk parent poms to 2.2.0-SNAPSHOT for Istanbul release. Change-Id: Ia5060116b986dae9e25b5765389e0c421bcd9fc6 Issue-ID: CCSDK-3190 Signed-off-by: Dan Timoney --- dependencies-bom/pom.xml | 2 +- dependencies-odl-bom/pom.xml | 2 +- installed-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 6 +++--- odlparent/bundle-parent/pom.xml | 6 +++--- odlparent/client-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 6 +++--- odlparent/karaf4-parent/pom.xml | 6 +++--- odlparent/mdsal-it-parent/pom.xml | 6 +++--- odlparent/odlparent-lite/pom.xml | 6 +++--- odlparent/odlparent/pom.xml | 6 +++--- odlparent/pom.xml | 4 ++-- odlparent/setup/pom.xml | 4 ++-- odlparent/single-feature-parent/pom.xml | 6 +++--- oparent/pom.xml | 4 ++-- pom.xml | 2 +- springboot/pom.xml | 4 ++-- springboot/spring-boot-setup/pom.xml | 4 ++-- springboot/springboot1/pom.xml | 4 ++-- springboot/springboot2/pom.xml | 4 ++-- standalone/pom.xml | 2 +- version.properties | 4 ++-- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 825d2c4d..84393ffd 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index c8433117..3f4a8037 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom diff --git a/installed-odl-bom/pom.xml b/installed-odl-bom/pom.xml index 378ff547..58e90a89 100644 --- a/installed-odl-bom/pom.xml +++ b/installed-odl-bom/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent installed-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 7d7cf1b2..bbe31023 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent binding-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 29c4d133..ae58d372 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent bundle-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index 8e7c5422..3ce86656 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent client-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 7bdc62eb..ce56562e 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 785e7c61..4bd69043 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent karaf4-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index c7d5b437..25d3b2f7 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent mdsal-it-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 49e6f331..1110c2e8 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 0f6f2be7..81e1b817 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/odlparent/pom.xml b/odlparent/pom.xml index eb3859db..2519dd44 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 7d56a25b..af058083 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.ccsdk.parent setup - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 4954e274..708a0ecf 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -193,14 +193,14 @@ org.onap.ccsdk.parent dependencies-odl-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/oparent/pom.xml b/oparent/pom.xml index f3270d96..85b6e273 100755 --- a/oparent/pom.xml +++ b/oparent/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent oparent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -82,7 +82,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 26b4b20f..04ca7a5c 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/pom.xml b/springboot/pom.xml index d636b0b0..8ef623af 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.ccsdk.parent springboot-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index 0c27ed9f..d41913b0 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent springboot-aggregator - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT org.onap.ccsdk.parent spring-boot-setup - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index c0f20d38..9adc268b 100644 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -145,7 +145,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index d31840cd..dc21d464 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-starter-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -145,7 +145,7 @@ org.onap.ccsdk.parent dependencies-bom - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom import diff --git a/standalone/pom.xml b/standalone/pom.xml index 93e1c2ed..93d581bc 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent standalone-parent - 2.1.2-SNAPSHOT + 2.2.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/version.properties b/version.properties index 2b56e7a8..f5ed3d4d 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=2 -sprint_number=1 -feature_revision=2 +sprint_number=2 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6