You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2015/07/05 23:06:00 UTC
[1/2] wicket git commit: Generate the release promotion/rollback
scripts Moved the commands you have to issue from the release.txt generation
to generating actual scripts you can execute. Should make rolling a release a
bit easier.
Repository: wicket
Updated Branches:
refs/heads/master 734a0d1c5 -> d24a47e5e
Generate the release promotion/rollback scripts
Moved the commands you have to issue from the release.txt generation to
generating actual scripts you can execute. Should make rolling a release
a bit easier.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/48945b76
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/48945b76
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/48945b76
Branch: refs/heads/master
Commit: 48945b767b7a878ea1aff3364b789db4d767ab2a
Parents: 734a0d1
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Jul 5 22:59:35 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Jul 5 22:59:35 2015 +0200
----------------------------------------------------------------------
release-dashorst.sh | 115 ++++++++++++++++++++++++++++++++++++-----------
1 file changed, 88 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/48945b76/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index 4a4efc2..a2ef6da 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -414,6 +414,74 @@ cat /tmp/release-$version-sigs.txt >> release-announce.txt
mvn_version_to_replace="$major_version.$minor_version.1-SNAPSHOT"
mvn_version_to_replace2="$major_version.$minor_version.0-SNAPSHOT"
+echo "Generating release promotion script 'promote-$version.sh'"
+echo "#!/bin/sh
+echo \"Promoting release $version
+
+Press enter to continue or CTRL-C to abort \\c\"
+
+read
+
+# push the build branch to ASF git repo
+
+git push origin $branch:refs/heads/$branch
+
+# Sign the release tag
+
+git checkout $tag
+git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log
+git checkout $branch
+
+# promote the source distribution by moving it from the staging area to the release area
+
+svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m \"Upload release to the mirrors\"
+
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has passed\"
+
+# Renumber the next development iteration $next_version:
+
+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\" {} \\;
+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:
+
+ svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \\\"Remove previous version from mirrors\\\"
+
+" > promote-$version.sh
+chmod +x promote-$version.sh
+
+echo "Generating release rollback script 'revert-$version.sh'"
+echo "#!/bin/sh
+echo \"Reverting release $version
+
+Press enter to continue or CTRL-C to abort \\c\"
+
+read
+
+git checkout $GIT_BRANCH
+git branch -D $branch
+git tag -d $tag
+
+svn rm https://dist.apache.org/repos/dist/dev/wicket/$version -m \"Release vote has failed\"
+
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has failed\"
+
+find . -name "*.releaseBackup" -exec rm {} \;
+rm release.properties
+
+" > revert-$version.sh
+
+chmod +x revert-$version.sh
+
+pushd target/dist
+find . -name "*.asc" -exec gpg --verify {} \;
+popd
+
echo "
The release has been created. It is up to you to check if the release is up
to par, and perform the following commands yourself when you start the vote
@@ -423,49 +491,42 @@ A vote email has been generated in release-vote.txt, you can copy/paste it using
cat release-vote.txt | pbcopy
-You can find the distribution in target/dist
+You can find the distribution in target/dist.
- cd target/dist
-To verify all signatures:
+Failed release
+--------------
- find . -name \"*.asc\" -exec gpg --verify {} \;
+To rollback a release due to a failed vote or some other complication use:
-To push the release branch to ASF git servers
+ $ ./revert-$version.sh
- git push origin $branch:refs/heads/$branch
+This will clean up the artfifacts from the staging areas, including Nexus,
+dist.apache.org and the release branch and tag.
-To move the release from staging to the mirrors:
- svn mv https://dist.apache.org/repos/dist/dev/wicket/$version https://dist.apache.org/repos/dist/release/wicket -m \"Upload release to the mirrors\"
-
-Remove previous version $previous_version from the mirrors
+Successful release
+------------------
- svn rm https://dist.apache.org/repos/dist/release/wicket/$previous_version -m \"Remove previous version from mirrors\"
+Congratulations on the successful release vote!
-To sign the release tag issue the following three commands:
+Use the release-announce.txt as a starter for the release announcement:
- git checkout $tag
- git tag --sign --force --message \"Signed release tag for Apache Wicket $version\" $tag >> $log
- git checkout $branch
+ cat release-announce.txt | pbcopy
-To renumber the next development iteration $next_version:
+To promote the release after a successful vote, run:
- 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\" {} \\;
- git add \`find . ! \\( -type d -name \"target\" -prune \\) -name pom.xml\`
- git commit -m \"Start next development version\"
- git push
+ $ ./promote-$version.sh
-To release the Maven artefacts:
+This will promote the Nexus staging repository to Maven Central, and move
+the release artifacts from the staging area to dist.apache.org. It will
+also sign the release tag and push the release branch to git.apache.org
- mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-release -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has passed\"
+You can read this message at a later time using:
-Or in case of a failed vote, to drop the staging repository:
+ $ cat release.txt
- mvn org.sonatype.plugins:nexus-staging-maven-plugin:LATEST:rc-drop -DstagingRepositoryId=$stagingrepoid -DnexusUrl=https://repository.apache.org -DserverId=apache.releases.https -Ddescription=\"Release vote has failed\"
+Happy voting!
" > release.txt
cat release.txt
[2/2] wicket git commit: Closes WICKET-5942 TestCase failure after
cfa36fbea621
Posted by da...@apache.org.
Closes WICKET-5942 TestCase failure after cfa36fbea621
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d24a47e5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d24a47e5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d24a47e5
Branch: refs/heads/master
Commit: d24a47e5e82d5a83f7ba53c21dbdba515643acf7
Parents: 48945b7
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Jul 5 23:05:41 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Jul 5 23:05:41 2015 +0200
----------------------------------------------------------------------
.../wicket/examples/repeater/RepeaterTest.java | 24 +-------------------
1 file changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d24a47e5/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
index e638ead..271a4a3 100644
--- a/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
+++ b/wicket-examples/src/test/java/org/apache/wicket/examples/repeater/RepeaterTest.java
@@ -18,14 +18,12 @@ package org.apache.wicket.examples.repeater;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Ignore;
import org.junit.Test;
/**
* Test for Repeater application
*/
-public class RepeaterTest extends Assert
+public class RepeaterTest
{
/**
* Test page.
@@ -39,8 +37,6 @@ public class RepeaterTest extends Assert
tester.startPage(Index.class);
tester.assertContains("Wicket Examples - repeater views");
- // AjaxDataTablePage below RepeatingPage will fail this test.
- checkPage(tester, AjaxDataTablePage.class);
checkPage(tester, RepeatingPage.class);
checkPage(tester, RefreshingPage.class);
checkPage(tester, FormPage.class);
@@ -50,24 +46,6 @@ public class RepeaterTest extends Assert
checkPage(tester, OIRPage.class);
checkPage(tester, DataGridPage.class);
checkPage(tester, GridViewPage.class);
- }
- finally
- {
- tester.destroy();
- }
- }
-
- @Ignore("WICKET-5942")
- @Test
- public void breakingRepeaterPages()
- {
- WicketTester tester = new WicketTester(new RepeaterApplication());
- try
- {
- tester.startPage(Index.class);
- tester.assertContains("Wicket Examples - repeater views");
-
- checkPage(tester, RepeatingPage.class);
checkPage(tester, AjaxDataTablePage.class);
}
finally