Repository: ant
Updated Branches:
  refs/heads/master a94a07d71 -> a218020f1


version bullet point needs to be moved until after the branch has been created


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/8d630f6a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/8d630f6a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/8d630f6a

Branch: refs/heads/master
Commit: 8d630f6aa9b3927416af3a4d3410c9667359d24c
Parents: a94a07d
Author: Stefan Bodewig <[email protected]>
Authored: Mon Jun 29 06:23:05 2015 +0200
Committer: Stefan Bodewig <[email protected]>
Committed: Mon Jun 29 07:01:11 2015 +0200

----------------------------------------------------------------------
 ReleaseInstructions | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/8d630f6a/ReleaseInstructions
----------------------------------------------------------------------
diff --git a/ReleaseInstructions b/ReleaseInstructions
index bdd2f73..35eb9e7 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -23,18 +23,7 @@ Note: This document was updated in the context of releasing 
Ant 1.9.5.
     For more information on performing branching and merging, please visit
     http://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell
 
-
-3.  Before a build :
-
-    the project.version property in build.xml governs the output of
-    ant -version and the naming of the distribution files.
-
-    Update the following files for version number:
-    
-    see at the end of this document the list of files containing
-    version information
-
-4.  Ensure you have all the external libraries that Ant uses in your
+3.  Ensure you have all the external libraries that Ant uses in your
     lib/optional directory.  All dependencies are either provided by
     JDK 1.5.0 or downloadable using
     ant -f fetch.xml -Ddest=optional.
@@ -42,7 +31,7 @@ Note: This document was updated in the context of releasing 
Ant 1.9.5.
     the build with -verbose option and scan for lines beginning with
     "Unable to load...". 
 
-5.  Create a branch just for the release, even if you've decided to
+4.  Create a branch just for the release, even if you've decided to
     not work with long lived branches in step 2.  This branch can be
     removed after the release.
 
@@ -50,10 +39,14 @@ Note: This document was updated in the context of releasing 
Ant 1.9.5.
 
     $ git checkout -b prepare_Ant_1.9.5
 
-6.  Make sure that your directory tree is clean by running git status.
+5.  Make sure that your directory tree is clean by running git status.
     Some tests leave behind leftovers which end up in the source
     distribution otherwise.
 
+6.  Set the version number in several files to the required new
+    versions.  See the end of this file for a list of files containing
+    version information.
+
 7.  Next bootstrap, build and run the tests.  Then build the
     distribution on the branch. It is important that this be a clean
     build. Tag this with a tag ANT_195_RC1.
@@ -73,7 +66,7 @@ Note: This document was updated in the context of releasing 
Ant 1.9.5.
     http://svn.apache.org/repos/asf/commons/sandbox/openpgp/trunk
     You have to build it using maven
     
-    You can create a property file .gnupg.properties in your home directory 
+    You can create a property file gnupg.properties in your home directory 
     with your key id
     and pass your key passphrase on the command line with -Dpassword=****
 

Reply via email to