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/06/22 10:23:56 UTC
[4/9] wicket git commit: Moved release:cleanup to better position
Moved release:cleanup to better position
It appears that the mvn release:cleanup removes the release.properties
file, thus breaking the script.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f069fc5d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f069fc5d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f069fc5d
Branch: refs/heads/master
Commit: f069fc5dddc402c10a56861df24816fbe0e4333d
Parents: 847634e
Author: Martijn Dashorst <da...@apache.org>
Authored: Mon Jun 15 13:12:14 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Mon Jun 15 13:12:14 2015 +0200
----------------------------------------------------------------------
release-dashorst.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f069fc5d/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index 80dac3c..d7bb3ea 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -126,6 +126,9 @@ $(git status)
"
fi
+echo "Cleaning up any release artifacts that might linger"
+mvn -q release:clean
+
log=$(pwd)/release.out
if [ -f $log ] ; then
@@ -158,9 +161,6 @@ echo "Ensuring we are starting from wicket-$major_version.x"
# otherwise we can't remove a previous release branch that failed
git checkout $GIT_BRANCH
-echo "Cleaning up any release artifacts that might linger"
-mvn -q release:clean
-
echo "Removing previous release tag $tag (if exists)"
oldtag=`git tag -l |grep -e "$tag"|wc -l`
[ "$oldtag" -ne 0 ] && git tag -d $tag