From 8c76c9880d88085d28fc33da582ff63d93d1e467 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 4 Mar 2020 11:02:01 -0500 Subject: [PATCH] Roll master version to Guilin numbering Roll master branch of ccsdk parent to 2.0.0-SNAPSHOT for Guilin. Since we anticipate breaking changes associated with Java 8 -> 11 and Sodium, the Guilin version will be a major version update (1.x -> 2.0) Change-Id: I3bf2c447fbecff4aa1973b9087190a2e41961457 Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- dependencies-bom/pom.xml | 2 +- dependencies-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 4 ++-- odlparent/bundle-parent/pom.xml | 4 ++-- odlparent/client-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 4 ++-- odlparent/karaf4-parent/pom.xml | 4 ++-- odlparent/mdsal-it-parent/pom.xml | 4 ++-- odlparent/odlparent-lite/pom.xml | 4 ++-- odlparent/odlparent/pom.xml | 4 ++-- odlparent/pom.xml | 4 ++-- odlparent/setup/pom.xml | 4 ++-- odlparent/single-feature-parent/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 | 6 +++--- 20 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 4e40997d..5d42b876 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 80f1b862..88a103de 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 16bb11b2..769c3165 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent binding-parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 4ae75c79..5d970db9 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent bundle-parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index d268dff5..0f5aefe2 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent client-parent - 1.5.2-SNAPSHOT + 2.0.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 1b8dc79c..c7480267 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 - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 04193fa1..10887cf7 100644 --- a/odlparent/karaf4-parent/pom.xml +++ b/odlparent/karaf4-parent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent karaf4-parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 030f6dc2..33cb294f 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 - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index fff41013..00c32c86 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 49fd86d4..c3560cf5 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/odlparent/pom.xml b/odlparent/pom.xml index d9af42d5..c301f431 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 4a90cec0..e3e5e2ba 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-aggregator - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.ccsdk.parent setup - 1.5.2-SNAPSHOT + 2.0.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 beaab1f7..2f304067 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 - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 9955e088..3b54f524 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/pom.xml b/springboot/pom.xml index 5b7f69fe..536791db 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.ccsdk.parent springboot-aggregator - 1.5.2-SNAPSHOT + 2.0.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 9709d212..53a8a596 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 - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT org.onap.ccsdk.parent spring-boot-setup - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 9cc72f8f..9fcddd08 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -143,7 +143,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index f5ca3300..d51a657d 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-starter-parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -143,7 +143,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom import diff --git a/standalone/pom.xml b/standalone/pom.xml index 9d2e9cfd..c850d029 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent standalone-parent - 1.5.2-SNAPSHOT + 2.0.0-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/version.properties b/version.properties index 99005bfb..1e23756d 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=1 -sprint_number=5 -feature_revision=2 +release_name=2 +sprint_number=0 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6