From 9341f0842038d226d24ff51cf358770c35ea8f7c Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 13 Mar 2019 16:05:39 -0400 Subject: [PATCH] Updates for Fluorine SR2 Update versions in CCSDK parent pom for Fluorine SR2 release Change-Id: I2325209b1359091b28cb485cad35aee5caadb13f Issue-ID: CCSDK-1156 Signed-off-by: Timoney, Dan (dt5972) --- odlparent/binding-parent/pom.xml | 30 +++++++++++----------- odlparent/bundle-parent/pom.xml | 30 +++++++++++----------- odlparent/client-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 30 +++++++++++----------- odlparent/mdsal-it-parent/pom.xml | 30 +++++++++++----------- odlparent/odlparent-lite/pom.xml | 30 +++++++++++----------- odlparent/odlparent/pom.xml | 30 +++++++++++----------- odlparent/pom.xml | 4 +-- odlparent/setup/pom.xml | 4 +-- .../src/main/properties/binding-parent.properties | 2 +- .../src/main/properties/bundle-parent.properties | 2 +- .../main/properties/feature-repo-parent.properties | 2 +- .../src/main/properties/mdsal-it-parent.properties | 2 +- .../src/main/properties/odlparent-lite.properties | 2 +- .../setup/src/main/properties/odlparent.properties | 2 +- .../properties/single-feature-parent.properties | 2 +- .../setup/src/main/resources/pom-template.xml | 26 +++++++++---------- odlparent/single-feature-parent/pom.xml | 30 +++++++++++----------- pom.xml | 2 +- springboot/pom.xml | 4 +-- springboot/springboot1/pom.xml | 12 ++++----- springboot/springboot2/pom.xml | 12 ++++----- version.properties | 4 +-- 23 files changed, 147 insertions(+), 147 deletions(-) diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 5827c5f5..5c730dd9 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent binding-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.opendaylight.mdsal binding-parent - 0.13.1 + 0.13.2 @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index f9342945..a93fbe2f 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent bundle-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.opendaylight.odlparent bundle-parent - 3.1.4 + 3.1.5 @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index 198362df..cb60d846 100644 --- a/odlparent/client-parent/pom.xml +++ b/odlparent/client-parent/pom.xml @@ -6,7 +6,7 @@ pom org.onap.ccsdk.parent client-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} http://wiki.onap.org diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 7ee21a64..5d73108d 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent feature-repo-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.opendaylight.odlparent feature-repo-parent - 3.1.4 + 3.1.5 @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 4de59b4b..b2a76739 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent mdsal-it-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.opendaylight.controller mdsal-it-parent - 1.8.1 + 1.8.2 @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index c8d84b27..e1847597 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent odlparent-lite - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.opendaylight.odlparent odlparent-lite - 3.1.4 + 3.1.5 @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index eea6875a..a0852f9e 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent odlparent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.opendaylight.odlparent odlparent - 3.1.4 + 3.1.5 @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/odlparent/pom.xml b/odlparent/pom.xml index c3c1b591..35a3e7de 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent odlparent-aggregator - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.onap.ccsdk.parent parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index 2d6c55f0..e2b4041c 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -8,12 +8,12 @@ pom org.onap.ccsdk.parent setup - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT diff --git a/odlparent/setup/src/main/properties/binding-parent.properties b/odlparent/setup/src/main/properties/binding-parent.properties index 1ee4ca32..81b803ea 100644 --- a/odlparent/setup/src/main/properties/binding-parent.properties +++ b/odlparent/setup/src/main/properties/binding-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=binding-parent odlparent.groupId=org.opendaylight.mdsal -odlparent.version=0.13.1 \ No newline at end of file +odlparent.version=0.13.2 \ No newline at end of file diff --git a/odlparent/setup/src/main/properties/bundle-parent.properties b/odlparent/setup/src/main/properties/bundle-parent.properties index fc2d87a1..0c254c59 100644 --- a/odlparent/setup/src/main/properties/bundle-parent.properties +++ b/odlparent/setup/src/main/properties/bundle-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=bundle-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.4 +odlparent.version=3.1.5 diff --git a/odlparent/setup/src/main/properties/feature-repo-parent.properties b/odlparent/setup/src/main/properties/feature-repo-parent.properties index c4523666..27347cb6 100644 --- a/odlparent/setup/src/main/properties/feature-repo-parent.properties +++ b/odlparent/setup/src/main/properties/feature-repo-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=feature-repo-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.4 +odlparent.version=3.1.5 diff --git a/odlparent/setup/src/main/properties/mdsal-it-parent.properties b/odlparent/setup/src/main/properties/mdsal-it-parent.properties index 4e23e5a5..39ec0371 100644 --- a/odlparent/setup/src/main/properties/mdsal-it-parent.properties +++ b/odlparent/setup/src/main/properties/mdsal-it-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=mdsal-it-parent odlparent.groupId=org.opendaylight.controller -odlparent.version=1.8.1 +odlparent.version=1.8.2 diff --git a/odlparent/setup/src/main/properties/odlparent-lite.properties b/odlparent/setup/src/main/properties/odlparent-lite.properties index c59dab4b..46bf9fd3 100644 --- a/odlparent/setup/src/main/properties/odlparent-lite.properties +++ b/odlparent/setup/src/main/properties/odlparent-lite.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent-lite odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.4 +odlparent.version=3.1.5 diff --git a/odlparent/setup/src/main/properties/odlparent.properties b/odlparent/setup/src/main/properties/odlparent.properties index 17a59874..e32f2d2f 100644 --- a/odlparent/setup/src/main/properties/odlparent.properties +++ b/odlparent/setup/src/main/properties/odlparent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=odlparent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.4 +odlparent.version=3.1.5 diff --git a/odlparent/setup/src/main/properties/single-feature-parent.properties b/odlparent/setup/src/main/properties/single-feature-parent.properties index f0436c2a..9fa116df 100644 --- a/odlparent/setup/src/main/properties/single-feature-parent.properties +++ b/odlparent/setup/src/main/properties/single-feature-parent.properties @@ -1,3 +1,3 @@ odlparent.artifactId=single-feature-parent odlparent.groupId=org.opendaylight.odlparent -odlparent.version=3.1.4 +odlparent.version=3.1.5 diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 52258d4a..7e8f7b09 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT \${ccsdk.sli.core.version} \${ccsdk.sli.adaptors.version} \${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 8a3e7417..43f829b4 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -11,12 +11,12 @@ pom org.onap.ccsdk.parent single-feature-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.opendaylight.odlparent single-feature-parent - 3.1.4 + 3.1.5 @@ -93,11 +93,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -106,12 +106,12 @@ - 1.8.1 - 2.5.1 - 0.13.1 - 1.8.1 - 1.5.1 - 1.8.1 + 1.8.2 + 2.5.2 + 0.13.2 + 1.8.2 + 1.5.2 + 1.8.2 1.11 @@ -134,7 +134,7 @@ integration/distribution, snmp4sdn, toolkit, ttp --> 2.8.11 - 3.23.1-GA + 3.24.0-GA @@ -162,7 +162,7 @@ 1.10.19 - 4.1.30.Final + 4.1.31.Final 1.7.25 diff --git a/pom.xml b/pom.xml index dcfca79d..5d9334b0 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom org.onap.ccsdk.parent parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/pom.xml b/springboot/pom.xml index dfd70f5a..9e0613f0 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent springboot-aggregator - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.onap.ccsdk.parent parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 3887f88e..8dabd679 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -6,7 +6,7 @@ pom org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 2da21aa7..397baf08 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -6,7 +6,7 @@ pom org.onap.ccsdk.parent spring-boot-starter-parent - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 - 0.4.1 + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT + 0.4.2-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/version.properties b/version.properties index ce4ab532..2e38dd81 100644 --- a/version.properties +++ b/version.properties @@ -6,10 +6,10 @@ release_name=1 sprint_number=2 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} -release_version=${base_version}-STAGING +release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT -- 2.16.6