From b8e1ddabe289f09decab3220754a7fc2bddf1681 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Thu, 25 Jun 2020 19:52:13 -0400 Subject: [PATCH] Release script updates --- etc/release-tools/processor-upgrade-dryrun.sh | 2 +- etc/release-tools/processor-upgrade.sh | 9 +++++---- etc/release-tools/sink-upgrade-dryrun.sh | 2 +- etc/release-tools/sink-upgrade.sh | 9 +++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/etc/release-tools/processor-upgrade-dryrun.sh b/etc/release-tools/processor-upgrade-dryrun.sh index 326a348a..80661fe1 100755 --- a/etc/release-tools/processor-upgrade-dryrun.sh +++ b/etc/release-tools/processor-upgrade-dryrun.sh @@ -8,7 +8,7 @@ fi pushd ../.. VERSION=$1 -./mvnw -f applications/processor versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false +./mvnw -f applications/processor versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false -DupdateMatchingVersions=false ./mvnw -f applications/processor versions:update-parent -DparentVersion=$2 -Pspring -DgenerateBackupPoms=false if [[ $VERSION =~ M[0-9]|RC[0-9] ]]; then diff --git a/etc/release-tools/processor-upgrade.sh b/etc/release-tools/processor-upgrade.sh index 2cabb731..29ce5534 100755 --- a/etc/release-tools/processor-upgrade.sh +++ b/etc/release-tools/processor-upgrade.sh @@ -5,16 +5,17 @@ if [ "$#" -ne 2 ]; then exit fi +VERSION=$1 + function git_commit_push { echo "in git commit" - git commit -am"Processor Applications: Release - $1" - git push origin master + git commit -am"Processor Applications: Release - $VERSION" + git push origin master && git push upstream master } pushd ../.. -VERSION=$1 -./mvnw -f applications/processor versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false +./mvnw -f applications/processor versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false -DupdateMatchingVersions=false ./mvnw -f applications/processor versions:update-parent -DparentVersion=$2 -Pspring -DgenerateBackupPoms=false if [[ $VERSION =~ M[0-9]|RC[0-9] ]]; then diff --git a/etc/release-tools/sink-upgrade-dryrun.sh b/etc/release-tools/sink-upgrade-dryrun.sh index 482f6f97..7f7d5cfe 100755 --- a/etc/release-tools/sink-upgrade-dryrun.sh +++ b/etc/release-tools/sink-upgrade-dryrun.sh @@ -8,7 +8,7 @@ fi pushd ../.. VERSION=$1 -./mvnw -f applications/sink versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false +./mvnw -f applications/sink versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false -DupdateMatchingVersions=false ./mvnw -f applications/sink versions:update-parent -DparentVersion=$2 -Pspring -DgenerateBackupPoms=false if [[ $VERSION =~ M[0-9]|RC[0-9] ]]; then diff --git a/etc/release-tools/sink-upgrade.sh b/etc/release-tools/sink-upgrade.sh index ad91f0af..0b97ebb2 100755 --- a/etc/release-tools/sink-upgrade.sh +++ b/etc/release-tools/sink-upgrade.sh @@ -5,16 +5,17 @@ if [ "$#" -ne 2 ]; then exit fi +VERSION=$1 + function git_commit_push { echo "in git commit" - git commit -am"Sink Applications: Release - $1" - git push origin master + git commit -am"Sink Applications: Release - $VERSION" + git push origin master && git push upstream master } pushd ../.. -VERSION=$1 -./mvnw -f applications/sink versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false +./mvnw -f applications/sink versions:set -DnewVersion=$VERSION -DgenerateBackupPoms=false -DupdateMatchingVersions=false ./mvnw -f applications/sink versions:update-parent -DparentVersion=$2 -Pspring -DgenerateBackupPoms=false if [[ $VERSION =~ M[0-9]|RC[0-9] ]]; then