wicket git commit: Improve the promotion script generation

[da...@apache.org]

Repository: wicket
Updated Branches:
  refs/heads/wicket-7.x ac0d9b099 -> 283d2f2e8


Improve the promotion script generation


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/283d2f2e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/283d2f2e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/283d2f2e

Branch: refs/heads/wicket-7.x
Commit: 283d2f2e822c4296f215b91ab1e192bb4446608a
Parents: ac0d9b0
Author: Martijn Dashorst <da...@apache.org>
Authored: Sat Oct 24 15:52:59 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sat Oct 24 15:52:59 2015 +0200

----------------------------------------------------------------------
 release.sh | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/283d2f2e/release.sh
----------------------------------------------------------------------
diff --git a/release.sh b/release.sh
index 32fdee5..e41a841 100755
--- a/release.sh
+++ b/release.sh
@@ -48,21 +48,16 @@ function generate_promotion_script {
     echo "Generating release promotion script 'promote-$version.sh'"
 read -d '' script <<- EOF
 #!/bin/sh
-echo -n "Promoting release $version
+echo "Promoting release $version
 
 Actions about to be performed:
 ------------------------------
 
 \$(cat \$0 | tail -n +14)
 
-------------------------------------------
-Press enter to continue or CTRL-C to abort"
-
-read
+------------------------------------------"
 
-# push the build branch to ASF git repo
-
-git push origin $branch:refs/heads/$branch
+read --prompt "Press enter to continue or CTRL-C to abort"
 
 # push the release tag to ASF git repo
 
@@ -78,13 +73,16 @@ mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingR
 
 git checkout $GIT_BRANCH
 mvn release:update-versions --batch-mode
-find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \;
-find . ! \( -type d -name "target" -prune \) -name pom.xml -exec sed -i "" -E "s/$mvn_version_to_replace/$next_version/g" {} \;
+mvn versions:set versions:commit -DnewVersion=$next_version
 git add \` find . ! \( -type d -name "target" -prune \) -name pom.xml \`
-git commit -m "Start next development version"
-git push
 
-echo "Remove the previous version of Wicket using this command:
+echo "
+Check the new versions and commit and push them to origin:
+
+  git commit -m \"Start next development version\"
+  git push
+
+Remove the previous version of Wicket using this command:
 
   svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \\\"Remove previous version from mirrors\\\"