You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2014/12/22 18:37:22 UTC
[6/6] ant-ivy git commit: Simplify the publication of the distribution
Simplify the publication of the distribution
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/5539fc8b
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/5539fc8b
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/5539fc8b
Branch: refs/heads/master
Commit: 5539fc8b2ef68c0ff32678cf8b349c8edf005869
Parents: 3df9444
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Mon Dec 22 18:37:05 2014 +0100
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Mon Dec 22 18:37:05 2014 +0100
----------------------------------------------------------------------
build-release.xml | 26 ++++++++++++++------------
doc/dev/makerelease.html | 38 +++++++++++++++++++++++---------------
2 files changed, 37 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5539fc8b/build-release.xml
----------------------------------------------------------------------
diff --git a/build-release.xml b/build-release.xml
index a164d67..e73bc36 100644
--- a/build-release.xml
+++ b/build-release.xml
@@ -232,8 +232,8 @@
</target>
<target name="snapshot-src" depends="snapshot-metadata,all-doc">
- <mkdir dir="${distrib.dir}"/>
- <zip destfile="${distrib.dir}/${snapshot.full.name}-src.zip">
+ <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+ <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip">
<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
<zipfileset dir="${src.dir}" prefix="${snapshot.full.name}/src/java"/>
<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
@@ -260,14 +260,15 @@
<zipfileset dir="${basedir}" includes="build.xml" fullpath="${snapshot.full.name}/build.xml"/>
</zip>
- <tar destfile="${distrib.dir}/${snapshot.full.name}-src.tar.gz"
+ <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.tar.gz"
compression="gzip" longfile="gnu">
- <zipfileset src="${distrib.dir}/${snapshot.full.name}-src.zip"/>
+ <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-src.zip"/>
</tar>
</target>
<target name="snapshot-bin-without-dependencies" depends="snapshot-metadata, jar, all-doc">
- <zip destfile="${distrib.dir}/${snapshot.full.name}-bin.zip">
+ <mkdir dir="${distrib.dir}/dist/${build.version}"/>
+ <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip">
<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
@@ -281,16 +282,17 @@
<zipfileset dir="${artifacts.build.dir}/jars" includes="${final.name}" fullpath="${snapshot.full.name}/ivy-${build.version}.jar"/>
</zip>
- <tar destfile="${distrib.dir}/${snapshot.full.name}-bin.tar.gz"
+ <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.tar.gz"
compression="gzip" longfile="gnu">
- <zipfileset src="${distrib.dir}/${snapshot.full.name}-bin.zip"/>
+ <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin.zip"/>
</tar>
</target>
<target name="snapshot-bin-with-dependencies" depends="snapshot-metadata, jar, all-doc">
+ <mkdir dir="${distrib.dir}/dist/${build.version}"/>
<delete dir="${build.dir}/lib" />
<ivy:retrieve conf="default" pattern="${build.dir}/lib/[artifact]-[revision].[ext]" />
- <zip destfile="${distrib.dir}/${snapshot.full.name}-bin-with-deps.zip">
+ <zip destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip">
<zipfileset dir="${doc.build.dir}" prefix="${snapshot.full.name}/doc" excludes="**/reports/coverage/**,**/reports/test/**"/>
<zipfileset dir="${basedir}/src/example" prefix="${snapshot.full.name}/src/example"/>
<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
@@ -305,9 +307,9 @@
<zipfileset dir="${build.dir}/lib" prefix="${snapshot.full.name}/lib" excludes="ant-*.jar,bcpg-*.jar,bcprov*.jar" />
</zip>
- <tar destfile="${distrib.dir}/${snapshot.full.name}-bin-with-deps.tar.gz"
+ <tar destfile="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.tar.gz"
compression="gzip" longfile="gnu">
- <zipfileset src="${distrib.dir}/${snapshot.full.name}-bin-with-deps.zip"/>
+ <zipfileset src="${distrib.dir}/dist/${build.version}/${snapshot.full.name}-bin-with-deps.zip"/>
</tar>
</target>
@@ -355,7 +357,7 @@
<target name="snapshot-checksums">
<checksum algorithm="md5">
- <fileset dir="${distrib.dir}">
+ <fileset dir="${distrib.dir}/dist/${build.version}">
<include name="*.pom"/>
<include name="*.jar"/>
<include name="*.zip"/>
@@ -363,7 +365,7 @@
</fileset>
</checksum>
<checksum algorithm="sha">
- <fileset dir="${distrib.dir}">
+ <fileset dir="${distrib.dir}/dist/${build.version}">
<include name="*.pom"/>
<include name="*.jar"/>
<include name="*.zip"/>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5539fc8b/doc/dev/makerelease.html
----------------------------------------------------------------------
diff --git a/doc/dev/makerelease.html b/doc/dev/makerelease.html
index cb0a89a..664cc09 100644
--- a/doc/dev/makerelease.html
+++ b/doc/dev/makerelease.html
@@ -51,16 +51,19 @@ And commit your changes in the branch:
git add doc/ivy.xsd
git commit -m "release the ivy.xsd"
</code>
+
<h3>4. Launch the release script</h3>
<code>
ant -f build-release.xml release
</code>
The status should be release only for final releases, and milestone for any other intermediate release.
If the release script is successful, release artifacts will be waiting for you in the build/distrib directory.
+
<h3>5. Verify the release</h3>
Check that all zips can be opened correctly, and that running 'ant' after unzipping the source distribution works properly.
You can also do a smoke test with the generated ivy.jar, to see if it is able to resolve properly a basic module (for instance you can run some tutorials provided in the src/example directory in all distributions).
-<h3>6. Sign and upload the artifacts</h3>
+
+<h3>6. Sign the artifacts</h3>
It's now time to sign the release artifacts and upload them to a location accessible by other Apache commiters.
Here is a simple way to sign the files using gnupg:
@@ -82,24 +85,18 @@ Be prepared to enter your passphrase several times if you use this script, gpg w
To be able to test the release within IvyDE, it can be deployed in the IvyDE update site. See <a href="http://ant.apache.org/ivy/ivyde/history/trunk/dev/updatesite.html">that page</a> to know how to process.
-<h3>8. Create a signed tag</h3>
-As soon as you are happy with the artifacts to be released, it is time to tag the release
-<code>
-git tag -s 2.0.0-beta1 -m 'Release Ivy 2.0.0-beta1'
-</code>
+<h3>8. Publish the release candidate</h3>
-And push the changes to the ASF repo
+All artifacts in <tt>build/distrib/dist</tt> needs to be published on the 'dist' svn of the ASF, in the <b>dev</b> part.
+
+The following command lines should do the job:
<code>
-git push --tags
+svn checkout -N https://dist.apache.org/repos/dist/dev/ant/ivy build/distrib/dist
+svn add build/distrib/dist/*
+svn commit build/distrib/dist -m 'Ivy 2.4.0 distribution'
</code>
-<h3>9. Publish the release candidate</h3>
-
-All artifacts in <tt>build/distrib</tt> except the <tt>maven2</tt> folder needs to be published on the 'dist' svn of the ASF, in the <b>dev</b> part.
-
-The artifacts should be pushed in that svn folder: https://dist.apache.org/repos/dist/dev/ant/ivy/$VERSION
-
-<h3>10. Publish the Maven artifact to Nexus</h3>
+<h3>9. Publish the Maven artifact to Nexus</h3>
Having your GPG key ID, its password, your apache ID and the associated password, just launch ant and enter the information as required:
<code>
@@ -114,6 +111,17 @@ Now <i>close</i> the staging repository, with the description "Ivy 2.0.0-beta1".
Once the checks passed, you can find in the <i>Summary</i> the URL of the staging repository. It will something like: https://repository.apache.org/content/repositories/orgapacheant-XXXX/
+<h3>10. Create a signed tag</h3>
+As soon as you are happy with the artifacts to be released, it is time to tag the release
+<code>
+git tag -s 2.0.0-beta1 -m 'Release Ivy 2.0.0-beta1'
+</code>
+
+And push the changes to the ASF repo
+<code>
+git push --tags
+</code>
+
<h3>11. Call for a vote to approve the release</h3>
Cast a vote to approve the release on the dev@ant.apache.org mailing list.