From f0d7c6a6ad64fb8e3d92b4302401e42218f0d840 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 17 Sep 2019 14:20:37 -0400 Subject: Roll to next snapshot Roll to next snapshot version Change-Id: I1d1e1d3040b049cdb336bb5fe3f5aac8c337e37c Issue-ID: CCSDK-1701 Signed-off-by: Timoney, Dan (dt5972) --- changeVersion.sh | 20 -------------------- dependencies-bom/pom.xml | 2 +- dependencies-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 14 +++++++------- odlparent/bundle-parent/pom.xml | 14 +++++++------- odlparent/client-parent/pom.xml | 2 +- odlparent/feature-repo-parent/pom.xml | 14 +++++++------- odlparent/mdsal-it-parent/pom.xml | 14 +++++++------- odlparent/odlparent-lite/pom.xml | 14 +++++++------- odlparent/odlparent/pom.xml | 14 +++++++------- odlparent/pom.xml | 4 ++-- odlparent/setup/pom.xml | 4 ++-- odlparent/setup/src/main/resources/pom-template.xml | 10 +++++----- odlparent/single-feature-parent/pom.xml | 14 +++++++------- pom.xml | 2 +- springboot/pom.xml | 4 ++-- springboot/springboot1/pom.xml | 14 +++++++------- springboot/springboot2/pom.xml | 14 +++++++------- standalone/pom.xml | 2 +- tools/changeVersion.sh | 20 ++++++++++++++++++++ version.properties | 2 +- 21 files changed, 100 insertions(+), 100 deletions(-) delete mode 100755 changeVersion.sh create mode 100755 tools/changeVersion.sh diff --git a/changeVersion.sh b/changeVersion.sh deleted file mode 100755 index 144ca539..00000000 --- a/changeVersion.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /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/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 7d72c861..8cc38296 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent dependencies-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index cd926e66..c505b137 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.odlparent diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index dc85129c..ccf0c673 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.mdsal @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -515,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 6cefd4e4..a1631654 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -515,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index 1948316b..068fc22e 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.3.4-SNAPSHOT + 1.3.5-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 9209e9b3..4b25d9dc 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -515,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 262118b1..fc3ee211 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.controller @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -515,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index c4f70bff..aba592b4 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -515,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 38998c0d..914a1368 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent odlparent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -515,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/odlparent/pom.xml b/odlparent/pom.xml index d7806d10..2ec1586b 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent odlparent-aggregator - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.onap.ccsdk.parent parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index e7210132..25751731 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -8,12 +8,12 @@ pom org.onap.ccsdk.parent setup - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index ea68e54d..c8a14458 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-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 cabcd289..2541bf10 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.opendaylight.odlparent @@ -93,11 +93,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -515,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 20f2699e..9650eca9 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom org.onap.ccsdk.parent parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/pom.xml b/springboot/pom.xml index d22c62fa..2f014fb7 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent springboot-aggregator - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.onap.ccsdk.parent parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index ad3fff90..6192231d 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -341,7 +341,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 9f2719b6..5dc51257 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.3.4-SNAPSHOT + 1.3.5-SNAPSHOT org.springframework.boot @@ -82,11 +82,11 @@ - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT - 0.5.3-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT + 0.5.4-SNAPSHOT ${ccsdk.sli.core.version} ${ccsdk.sli.adaptors.version} ${ccsdk.sli.core.version} @@ -366,7 +366,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT pom import diff --git a/standalone/pom.xml b/standalone/pom.xml index 42924e54..c3e79d0a 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -8,7 +8,7 @@ pom org.onap.ccsdk.parent standalone-parent - 1.3.4-SNAPSHOT + 1.3.5-SNAPSHOT http://wiki.onap.org diff --git a/tools/changeVersion.sh b/tools/changeVersion.sh new file mode 100755 index 00000000..144ca539 --- /dev/null +++ b/tools/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/version.properties b/version.properties index 10dee482..eaf9fce4 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=3 -feature_revision=4 +feature_revision=5 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg