Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 6e585bdb2 -> 42f3517e1


Add changelog check and move staging repo closing to right after release:perform


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

Branch: refs/heads/wicket-6.x
Commit: 42f3517e19e094d177fad416fe06bac1b7e3eec2
Parents: 6e585bd
Author: Martijn Dashorst <[email protected]>
Authored: Fri Aug 29 13:44:14 2014 +0200
Committer: Martijn Dashorst <[email protected]>
Committed: Fri Aug 29 13:44:14 2014 +0200

----------------------------------------------------------------------
 release-dashorst.sh | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/42f3517e/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index c3bacde..01301b2 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -107,6 +107,18 @@ bugfix_version=$(expr $current_version : 
'.*\..*\.\(.*\)-SNAPSHOT')
 version="$major_version.$minor_version.0"
 previous_version="$major_version.$(expr $minor_version - 1).0"
 
+# Check if the changelog has the issues of 6.x
+
+grep -q "$version\$" CHANGELOG-6.x
+if [ $? -ne 0 ] ; then
+       fail "
+You have forgotten to add the closed tickets for Wicket $version to the 
CHANGELOG-6.x file
+
+Go to 
https://issues.apache.org/jira/secure/ConfigureReleaseNote.jspa?projectId=12310561
+and export the issues to the changelog.
+"
+fi
+
 echo "This script will release version: Apache Wicket $version"
 echo ""
 echo "Press enter to continue or CTRL-C to abort \c"
@@ -195,6 +207,13 @@ if [ $? -ne 0 ] ; then
        fail "ERROR: mvn release:perform was not successful"
 fi
 
+# Determine the staging repository and close it after deploying the release to 
the staging area
+stagingrepoid=$(mvn 
org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list 
-DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https |grep 
-Eo "(orgapachewicket-\d+)";)
+
+echo "Closing staging repository with id $stagingrepoid"
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-close 
-DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org 
-DserverId=apache.releases.https -Ddescription="Release has been built, 
awaiting vote"
+
+
 echo "Create and sign the source tarballs"
 
 mkdir -p target/dist/binaries
@@ -240,12 +259,6 @@ svn add *
 svn commit -m "Upload wicket-$version to staging area"
 popd
 
-stagingrepoid=$(mvn 
org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-list 
-DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https |grep 
-Eo "(orgapachewicket-\d+)";)
-
-echo "Closing staging repository with id $stagingrepoid"
-
-mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-close 
-DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org 
-DserverId=apache.releases.https -Ddescription="Release has been built, 
awaiting vote"
-
 echo "Generating Vote email"
 
 echo "This is a vote to release Apache Wicket $version

Reply via email to