Author: maartenc
Date: Tue Jan 20 12:35:02 2009
New Revision: 736095
URL: http://svn.apache.org/viewvc?rev=736095&view=rev
Log:
Tag ivy release 2.0.0.final
Added:
ant/ivy/updatesite/tags/ivy-2.0.0.final/
- copied from r732530, ant/ivy/updatesite/trunk/
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/digest.zip
- copied unchanged from r732858, ant/ivy/updatesite/trunk/dist/digest.zip
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/digest.zip.asc
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/digest.zip.asc
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/digest.zip.md5
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/digest.zip.md5
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/digest.zip.sha
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/digest.zip.sha
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.final.jar
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.final.jar
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.final.jar.asc
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.final.jar.asc
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.final.jar.md5
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.final.jar.md5
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.final.jar.sha
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/features/org.apache.ivy.feature_2.0.0.final.jar.sha
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar.asc
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar.asc
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar.md5
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar.md5
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz.asc
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz.asc
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz.md5
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz.md5
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz.sha
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar.pack.gz.sha
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.final.jar.sha
- copied unchanged from r732858,
ant/ivy/updatesite/trunk/dist/plugins/org.apache.ivy_2.0.0.final.jar.sha
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/site.xml
- copied unchanged from r732858, ant/ivy/updatesite/trunk/dist/site.xml
Removed:
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.cr2.jar
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.cr2.jar.asc
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.cr2.jar.md5
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/features/org.apache.ivy.feature_2.0.0.cr2.jar.sha
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar.asc
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar.md5
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar.pack.gz
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar.pack.gz.asc
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar.pack.gz.md5
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar.pack.gz.sha
ant/ivy/updatesite/tags/ivy-2.0.0.final/dist/plugins/org.apache.ivy_2.0.0.cr2.jar.sha
Modified:
ant/ivy/updatesite/tags/ivy-2.0.0.final/build.xml
Modified: ant/ivy/updatesite/tags/ivy-2.0.0.final/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/updatesite/tags/ivy-2.0.0.final/build.xml?rev=736095&r1=732530&r2=736095&view=diff
==============================================================================
--- ant/ivy/updatesite/tags/ivy-2.0.0.final/build.xml (original)
+++ ant/ivy/updatesite/tags/ivy-2.0.0.final/build.xml Tue Jan 20 12:35:02 2009
@@ -16,7 +16,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project default="optimize" basedir=".">
+<project default="optimize" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"
xmlns:openpgp="antlib:org.apache.commons.openpgp.ant">
<property file="local.build.properties" />
@@ -180,9 +180,9 @@
<target name="verify-checksum" description="Verify the checksums of the
artifacts to publish">
<checksum algorithm="MD5" fileext=".md5" format="MD5SUM"
verifyproperty="checksum.md5.ok" >
<fileset dir="${updatesite.dir}">
- <include name="plugins/org.apache.ivy*.jar" />
- <include name="plugins/org.apache.ivy*.jar.pack.gz" />
- <include name="features/org.apache.ivy*.jar" />
+ <include name="plugins/org.apache.ivy.*.jar" />
+ <include name="plugins/org.apache.ivy.*.jar.pack.gz" />
+ <include name="features/org.apache.ivy.*.jar" />
<include name="digest.zip" />
</fileset>
</checksum>
@@ -194,9 +194,9 @@
<echo message="MD5 Checksum verify passed successfully" />
<checksum algorithm="SHA" fileext=".sha" format="MD5SUM"
verifyproperty="checksum.sha.ok" >
<fileset dir="${updatesite.dir}">
- <include name="plugins/org.apache.ivy*.jar" />
- <include name="plugins/org.apache.ivy*.jar.pack.gz" />
- <include name="features/org.apache.ivy*.jar" />
+ <include name="plugins/org.apache.ivy.*.jar" />
+ <include name="plugins/org.apache.ivy.*.jar.pack.gz" />
+ <include name="features/org.apache.ivy.*.jar" />
<include name="digest.zip" />
</fileset>
</checksum>
@@ -208,4 +208,71 @@
<echo message="SHA Checksum verify passed successfully" />
</target>
+ <target name="sign">
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+ uri="antlib:org.apache.ivy.ant">
+ <classpath>
+ <fileset dir="dist/plugins"
includes="org.apache.ivy_*.final.jar" />
+ </classpath>
+ </taskdef>
+
+ <ivy:settings id="sign.settingsId"
file="ivysettings-signtask.xml" />
+ <ivy:cachepath organisation="org.apache.commons"
settingsRef="sign.settingsId" transitive="false" log="download-only"
+ module="commons-openpgp"
revision="1.0-SNAPSHOT" inline="true" pathid="openpgp.classpath"/>
+ <ivy:cachepath organisation="bouncycastle"
settingsRef="sign.settingsId" log="download-only"
+ module="bcprov-jdk16" revision="140"
inline="true" pathid="bouncycastle.bcprov.classpath"/>
+
+ <!-- Didn't find the jdk1.6 bcpg dependency, using the jdk1.5
version instead -->
+ <ivy:cachepath organisation="bouncycastle"
settingsRef="sign.settingsId" transitive="false" log="download-only"
+ module="bcpg-jdk15" revision="140"
inline="true" pathid="bouncycastle.bcpg.classpath"/>
+
+ <property file="${user.home}/ivybuild.properties" />
+ <input message="please enter your PGP password: "
addproperty="pgp.password"/>
+ <input message="please enter your PGP keyId: "
addproperty="pgp.keyId"/>
+
+ <!--
+ For some reason, if we use the openpgp:signer task here
directly, the bouncycastle security
+ provider cannot be loaded. If we launch it as a forked
process everything works fine !?!
+ -->
+ <java classname="org.apache.tools.ant.launch.Launcher"
+ fork="true">
+ <classpath>
+ <fileset dir="${ant.home}" includes="**/*.jar"
/>
+ <path refid="bouncycastle.bcprov.classpath" />
+ <path refid="bouncycastle.bcpg.classpath" />
+ <path refid="openpgp.classpath" />
+ </classpath>
+ <arg line="-f build.xml" />
+ <arg line="sign-internal" />
+ <arg line="-Dpgp.password=${pgp.password}" />
+ <arg line="-Dpgp.keyId=${pgp.keyId}" />
+ </java>
+ </target>
+
+ <target name="sign-internal">
+ <property file="build.properties" />
+ <taskdef resource="org/apache/commons/openpgp/ant/antlib.xml"
uri="antlib:org.apache.commons.openpgp.ant" />
+ <openpgp:signer secring="${user.home}/.gnupg/secring.gpg"
+
pubring="${user.home}/.gnupg/pubring.gpg"
+ password="${pgp.password}"
+ keyid="${pgp.keyId}"
+ asciiarmor="true">
+ <fileset dir="dist" includes="**/*.jar">
+ <depend targetdir="dist">
+ <mapper type="glob" from="*.jar"
to="*.jar.asc"/>
+ </depend>
+ </fileset>
+ <fileset dir="dist" includes="**/*.zip">
+ <depend targetdir="dist">
+ <mapper type="glob" from="*.zip"
to="*.zip.asc"/>
+ </depend>
+ </fileset>
+ <fileset dir="dist" includes="**/*.gz">
+ <depend targetdir="dist">
+ <mapper type="glob" from="*.gz"
to="*.gz.asc"/>
+ </depend>
+ </fileset>
+ </openpgp:signer>
+ </target>
+
</project>
