From 91b7149d735549f392a389b6b469ae07567ae31c Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 14 May 2020 13:53:13 -0400 Subject: Roll to next Frankfurt version Roll to next Frankfurt version and update CCSDK versions to reflect versions to be used for RC2 Change-Id: I5f4d48bcdab72bd8ff2455594ae10ac889320fa8 Issue-ID: CCSDK-2345 Signed-off-by: Dan Timoney --- dependencies-bom/pom.xml | 2 +- dependencies-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 12 ++++++------ odlparent/bundle-parent/pom.xml | 12 ++++++------ odlparent/client-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 12 ++++++------ odlparent/karaf4-parent/pom.xml | 12 ++++++------ odlparent/mdsal-it-parent/pom.xml | 12 ++++++------ odlparent/odlparent-lite/pom.xml | 12 ++++++------ odlparent/odlparent/pom.xml | 12 ++++++------ odlparent/pom.xml | 4 ++-- odlparent/setup/pom.xml | 4 ++-- odlparent/setup/src/main/resources/pom-template.xml | 8 ++++---- odlparent/single-feature-parent/pom.xml | 12 ++++++------ pom.xml | 2 +- springboot/pom.xml | 4 ++-- springboot/spring-boot-setup/pom.xml | 4 ++-- .../spring-boot-setup/src/main/resources/pom-template.xml | 8 ++++---- springboot/springboot1/pom.xml | 12 ++++++------ springboot/springboot2/pom.xml | 12 ++++++------ standalone/pom.xml | 2 +- version.properties | 2 +- 22 files changed, 82 insertions(+), 82 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index c221190f..491aecc9 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 74caa72e..6774275f 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 3aa2186d..ae0d8fc1 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index e74034d6..8562b4e6 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index 262ddb0a..c152279d 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 13ccc126..6c604e01 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml index 4e133230..0d2e1e2b 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index de57fb7a..fb281b77 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 788385fa..17590566 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index ce86efde..47a1b6c5 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent odlparent - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 15d02d2d..4b1db400 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 97a7b204..a5b0017d 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-aggregator - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT org.onap.ccsdk.parent setup - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 95007f41..45dd3dfa 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT \${ccsdk.sli.core.version} \${ccsdk.sli.adaptors.version} diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index ec8ae1cf..b355b38b 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -96,11 +96,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} @@ -191,7 +191,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index bceddd26..4586b152 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent parent - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/pom.xml b/springboot/pom.xml index 998c9dfc..2db6da82 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent parent - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT org.onap.ccsdk.parent springboot-aggregator - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index fdd6f741..50158304 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.5-SNAPSHOT + 1.5.6-SNAPSHOT org.onap.ccsdk.parent spring-boot-setup - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml index e451be6c..8572b2d3 100644 --- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml +++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml @@ -91,11 +91,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index b02b6761..b1ae7e55 100644 --- 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.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -91,11 +91,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT @@ -143,7 +143,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 5922dc38..51445bc7 100644 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -14,7 +14,7 @@ org.onap.ccsdk.parent spring-boot-starter-parent - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} @@ -91,11 +91,11 @@ 1.6.5 - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT - 0.7.3-SNAPSHOT + 0.7.2 + 0.7.2 0.7.3-SNAPSHOT @@ -143,7 +143,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom import diff --git a/standalone/pom.xml b/standalone/pom.xml index 07cd4f58..73519cff 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.parent standalone-parent - 1.5.5-SNAPSHOT + 1.5.6-SNAPSHOT pom ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/version.properties b/version.properties index 3740ac8d..a5f7b787 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=5 -feature_revision=5 +feature_revision=6 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg