From e8e914a2d6fbefe2ab403af1ec43f60623edc5f4 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 30 Apr 2019 09:39:01 -0400 Subject: [PATCH] Roll master to El Alto Roll master version to El Alto versions Change-Id: I43315307b01929c46333f181f5b516ab2704696f Issue-ID: CCSDK-1222 Signed-off-by: Timoney, Dan (dt5972) --- changeVersion.sh | 20 ++++++++++++++++++++ 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/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 | 10 +++++----- odlparent/single-feature-parent/pom.xml | 12 ++++++------ pom.xml | 2 +- springboot/pom.xml | 4 ++-- springboot/springboot1/pom.xml | 12 ++++++------ springboot/springboot2/pom.xml | 12 ++++++------ version.properties | 4 ++-- 17 files changed, 89 insertions(+), 69 deletions(-) create mode 100755 changeVersion.sh diff --git a/changeVersion.sh b/changeVersion.sh new file mode 100755 index 00000000..144ca539 --- /dev/null +++ b/changeVersion.sh @@ -0,0 +1,20 @@ +#! /bin/bash + +if [ $# -ne 1 ] +then + echo "Usage: $0 new-version" + exit 1 +fi + + +mvn versions:set versions:update-child-modules versions:commit -B -DnewVersion=$1 + +base_version=$(echo $1 | cut -d- -f1) +major=$(echo $base_version | cut -d. -f1) +minor=$(echo $base_version | cut -d. -f2) +patch=$(echo $base_version | cut -d. -f3) + +if [ -f version.properties ] +then + sed -i '' -e 's/\(release_name=\).*/\1'$major'/;s/\(sprint_number=\).*/\1'$minor'/;s/\(feature_revision=\).*/\1'$patch'/' version.properties +fi diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index a29df00e..464f48f9 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent binding-parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.opendaylight.mdsal @@ -93,11 +93,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 1c9e6dbc..107f1d2b 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent bundle-parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index cb60d846..2304952e 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.2-SNAPSHOT + 1.3.0-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 17c774c6..cea47d45 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent feature-repo-parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 9057110f..b5dfd2c1 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent mdsal-it-parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.opendaylight.controller @@ -93,11 +93,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 15d3312c..dd6881d2 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent odlparent-lite - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index f8b07ce4..896aff1b 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent odlparent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 35a3e7de..94301b74 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent odlparent-aggregator - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.onap.ccsdk.parent parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index e2b4041c..d28f0517 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -8,12 +8,12 @@ pom org.onap.ccsdk.parent setup - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index e8dd237e..71d43a92 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.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT \${ccsdk.sli.core.version} \${ccsdk.sli.adaptors.version} \${ccsdk.sli.core.version} diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 2e741cf9..4057aa17 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent single-feature-parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/pom.xml b/pom.xml index 5d9334b0..a7830855 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom org.onap.ccsdk.parent parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/pom.xml b/springboot/pom.xml index 9e0613f0..606f23fc 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent springboot-aggregator - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT org.onap.ccsdk.parent parent - 1.2.2-SNAPSHOT + 1.3.0-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index a7dc2390..fc2ad065 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.2-SNAPSHOT + 1.3.0-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-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 3950e672..8073ea7b 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.2-SNAPSHOT + 1.3.0-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 - 0.4.2 + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT + 0.5.0-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} diff --git a/version.properties b/version.properties index 2e38dd81..8e5be7b0 100644 --- a/version.properties +++ b/version.properties @@ -5,8 +5,8 @@ release_name=1 -sprint_number=2 -feature_revision=2 +sprint_number=3 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6