| @@ -5,7 +5,7 @@ Authors: Conor MacNeill | |||||
| Magesh Umasankar | Magesh Umasankar | ||||
| Antoine Levy-Lambert | Antoine Levy-Lambert | ||||
| Note: This document was updated in the context of releasing Ant 1.9.3. | |||||
| Note: This document was updated in the context of releasing Ant 1.9.5. | |||||
| Please interpret the branch names, tags, etc. according to | Please interpret the branch names, tags, etc. according to | ||||
| your context. | your context. | ||||
| @@ -35,7 +35,7 @@ Note: This document was updated in the context of releasing Ant 1.9.3. | |||||
| and 1.9.xbeta on the branch. | and 1.9.xbeta on the branch. | ||||
| For more information on performing branching and merging, please visit | For more information on performing branching and merging, please visit | ||||
| http://svnbook.red-bean.com/nightly/en/svn-book.html | |||||
| http://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell | |||||
| 4. Before a build : | 4. Before a build : | ||||
| @@ -55,20 +55,19 @@ Note: This document was updated in the context of releasing Ant 1.9.3. | |||||
| the build with -verbose option and scan for lines beginning with | the build with -verbose option and scan for lines beginning with | ||||
| "Unable to load...". | "Unable to load...". | ||||
| 6. Make sure that your directory tree is clean by running svn status. | |||||
| 6. Make sure that your directory tree is clean by running git status. | |||||
| Some tests leave behind leftovers which end up in the source | Some tests leave behind leftovers which end up in the source | ||||
| distribution otherwise. | distribution otherwise. | ||||
| 7. Next bootstrap, build and run the tests. Then build the distribution | 7. Next bootstrap, build and run the tests. Then build the distribution | ||||
| on the branch. It is important that this be a clean build. Label this with | |||||
| a tag ANT_193. | |||||
| on the branch. It is important that this be a clean build. Tag this with | |||||
| a tag ANT_195. | |||||
| The file release.sh gives an idea of how to do this build process. | The file release.sh gives an idea of how to do this build process. | ||||
| buid.xml specifies that the code should be compiled with source=1.5 and target=1.5. | buid.xml specifies that the code should be compiled with source=1.5 and target=1.5. | ||||
| svn copy https://svn.apache.org/repos/asf/ant/core/trunk \ | |||||
| https://svn.apache.org/repos/asf/ant/core/tags/ANT_193 \ | |||||
| -m "Tagging version 1.9.3 of Ant" | |||||
| git tag -s -m "Tagging version 1.9.5 of Ant" ANT_195 | |||||
| git push --tags | |||||
| 8. Sign the distribution files using the script release/signit.xml | 8. Sign the distribution files using the script release/signit.xml | ||||
| @@ -84,7 +83,7 @@ Note: This document was updated in the context of releasing Ant 1.9.3. | |||||
| Before you do that, ensure that the key you use is inside the KEYS | Before you do that, ensure that the key you use is inside the KEYS | ||||
| file in Ant's SVN repository | file in Ant's SVN repository | ||||
| <https://svn.apache.org/repos/asf/ant/antlibs/common/trunk/KEYS> - | |||||
| <https://git-wip-us.apache.org/repos/asf?p=ant-antlibs-common.git;a=blob;f=KEYS;h=dc62b011b1b429bd6de913f8f2bce79b715f96db;hb=HEAD> - | |||||
| and that you copy the KEYS file to | and that you copy the KEYS file to | ||||
| /www/www.apache.org/dist/ant | /www/www.apache.org/dist/ant | ||||
| @@ -101,43 +100,44 @@ Note: This document was updated in the context of releasing Ant 1.9.3. | |||||
| This target generates a file build/html/WHATSNEW.html | This target generates a file build/html/WHATSNEW.html | ||||
| Add an html head element with a title like "Release Notes of Apache Ant | Add an html head element with a title like "Release Notes of Apache Ant | ||||
| 1.9.3" (from the default txt2html) | |||||
| 1.9.5" (from the default txt2html) | |||||
| Cut all sections about previous releases to keep only the current release, | Cut all sections about previous releases to keep only the current release, | ||||
| and save as RELEASE-NOTES-1.9.3.html inside the distribution folder. | |||||
| and save as RELEASE-NOTES-1.9.5.html inside the distribution folder. | |||||
| Copy the file RELEASE-NOTES-1.9.3.html also as README.html | |||||
| Copy the file RELEASE-NOTES-1.9.5.html also as README.html | |||||
| 10. The distribution is now ready to go. | 10. The distribution is now ready to go. | ||||
| Create a SVN sandbox on your computer with https://dist.apache.org/repos/dist/dev/ant in it | Create a SVN sandbox on your computer with https://dist.apache.org/repos/dist/dev/ant in it | ||||
| Copy the distribution folder to the location of the sandbox. | Copy the distribution folder to the location of the sandbox. | ||||
| svn add the files and commit into https://dist.apache.org/repos/dist/dev/ant | svn add the files and commit into https://dist.apache.org/repos/dist/dev/ant | ||||
| 11. * upload the maven artifacts located under java-repository/org/apache/ant | |||||
| these artifacts comprise currently for each ant jar of one POM file, the corresponding jar file | |||||
| and the corresponding GPG signatures (x.pom, x.jar, x.pom.asc, x.jar.asc) | |||||
| MD5 and SHA1 are generated by ivy during the upload | |||||
| 11. | |||||
| * upload the maven artifacts located under java-repository/org/apache/ant | |||||
| these artifacts comprise currently for each ant jar of one POM file, the corresponding jar file | |||||
| and the corresponding GPG signatures (x.pom, x.jar, x.pom.asc, x.jar.asc) | |||||
| MD5 and SHA1 are generated by ivy during the upload | |||||
| to | |||||
| to | |||||
| https://repository.apache.org (nexus repository) | |||||
| https://repository.apache.org (nexus repository) | |||||
| using the build file release/upload.xml | |||||
| using the build file release/upload.xml | |||||
| ant -Dupload.user=foo -Dupload.password=secret -lib location_of_ivy_jar -f upload.xml | |||||
| ant -Dupload.user=foo -Dupload.password=secret -lib location_of_ivy_jar -f upload.xml | |||||
| * after the upload, you need to access the web interface of nexus under https://repository.apache.org | |||||
| login using your Apache credentials | |||||
| in the left pane, below "build promotion", click on the "Stagings Repositories" links | |||||
| expand org.apache.ant | |||||
| select the checkbox next to the upload that you just did | |||||
| click the button "Close" on the top of the table listing the uploads | |||||
| make a note of the location of the staging repository for the vote email | |||||
| * after the upload, you need to access the web interface of nexus under https://repository.apache.org | |||||
| login using your Apache credentials | |||||
| in the left pane, below "build promotion", click on the "Stagings Repositories" links | |||||
| expand org.apache.ant | |||||
| select the checkbox next to the upload that you just did | |||||
| click the button "Close" on the top of the table listing the uploads | |||||
| make a note of the location of the staging repository for the vote email | |||||
| 12. Once this is committed send a release vote email on dev@ant. | 12. Once this is committed send a release vote email on dev@ant. | ||||
| The email will typically mention : | The email will typically mention : | ||||
| - the SVN tag for the release including revision number, | |||||
| - the git tag for the release including commit hash, | |||||
| - the location of the tarballs, including revision number in dist.apache.org repository | - the location of the tarballs, including revision number in dist.apache.org repository | ||||
| - the URL for the maven artifacts | - the URL for the maven artifacts | ||||
| @@ -157,11 +157,11 @@ Note: This document was updated in the context of releasing Ant 1.9.3. | |||||
| available via the archive. To do so, just use the "svn rm" command against | available via the archive. To do so, just use the "svn rm" command against | ||||
| the artifacts or folders to remove. | the artifacts or folders to remove. | ||||
| 15. Address the available version tags in BugZilla. Create a new version 1.9.4. | |||||
| Assign all existing 1.9.3 bugs to 1.9.4. | |||||
| 15. Address the available version tags in BugZilla. Create a new version 1.9.6. | |||||
| Assign all existing 1.9.5 bugs to 1.9.6. | |||||
| Note that such massive changes can be done at once by choosing the | Note that such massive changes can be done at once by choosing the | ||||
| link "Change several bugs at once" at the bottom of the bug list | link "Change several bugs at once" at the bottom of the bug list | ||||
| displaying the 1.9.3 bugs. | |||||
| displaying the 1.9.5 bugs. | |||||
| 16. Once that is done, do a test download to make sure everything is OK. A | 16. Once that is done, do a test download to make sure everything is OK. A | ||||
| common problem may be: | common problem may be: | ||||