You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2017/08/17 14:41:11 UTC

[6/6] logging-log4cxx git commit: Remove "-e" because a missing branch shouldn't stop the other executions and remove the last release date.

Remove "-e" because a missing branch shouldn't stop the other executions and remove the last release date.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/41c0a994
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/41c0a994
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/41c0a994

Branch: refs/heads/release_scripts
Commit: 41c0a994fb53ea58829a3585dfadb0c65244bb7a
Parents: 4c3f0dd
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 16:40:27 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 16:40:27 2017 +0200

----------------------------------------------------------------------
 releasePurge.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/41c0a994/releasePurge.sh
----------------------------------------------------------------------
diff --git a/releasePurge.sh b/releasePurge.sh
index d692e93..8f17bb7 100755
--- a/releasePurge.sh
+++ b/releasePurge.sh
@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /bin/bash
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -44,16 +44,20 @@ function purge_branch_and_tag()
 
 function revert_pom_and_changes()
 {
+  # Remove not needed "release" node.
   sed -i -r "s/^(\t<version>).+(<)/\10.11.0-SNAPSHOT\2/" "pom.xml"
   sed -i -r "1,/.+<release.+/ s/.+<release.+//"          "src/changes/changes.xml"
   sed -i -r "1,/.+date=.+/ s/.+date=.+//"                "src/changes/changes.xml"
   sed -i -r "1,/.+description=.+/ s/.+description=.+//"  "src/changes/changes.xml"
   sed -i -r "1,/.+<\/release.+/ s/.+<\/release.+//"      "src/changes/changes.xml"
   
-  # Don't know ho to remove the created newlines in changes easier...
+  # Don't know how to remove the left newlines easier...
   local changes=$(cat "src/changes/changes.xml")
   echo "${changes/$'\n\n\n\n\n'/}" > "src/changes/changes.xml"
 
+  # Last release date needs to be "unknown":
+  sed -i -r "1,/.+date=.+/ s/date=\".+\"/date=\"XXXX-XX-XX\"/" "src/changes/changes.xml"
+
   git add "pom.xml"
   git add "src/changes/changes.xml"