You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2012/02/06 20:09:33 UTC
svn commit: r1241117 - in /incubator/jspwiki/trunk: ChangeLog build.xml
src/org/apache/wiki/Release.java
Author: juanpablo
Date: Mon Feb 6 19:09:33 2012
New Revision: 1241117
URL: http://svn.apache.org/viewvc?rev=1241117&view=rev
Log:
* 2.9.0-svn-4
* taken back <signeddist/> goal from 3.0 branch in order to be able to accomplish JSPWIKI-557
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1241117&r1=1241116&r2=1241117&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Feb 6 19:09:33 2012
@@ -1,3 +1,10 @@
+2012-01-14 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.9.0-svn-4
+
+ * taken back <signeddist/> goal from 3.0 branch in order to be able to accomplish
+ JSPWIKI-557
+
2012-02-01 Harry Metske <me...@apache.org>
* 2.9.0-svn-3
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1241117&r1=1241116&r2=1241117&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon Feb 6 19:09:33 2012
@@ -580,6 +580,36 @@
</target>
+ <!-- Nabbed from solr -->
+ <macrodef name="sign-artifact" description="Signs the artifact">
+ <attribute name="input.file"/>
+ <attribute name="output.file" default="@{input.file}.asc"/>
+ <sequential>
+ <echo>Signing @{input.file} Sig File: @{output.file}</echo>
+
+ <exec executable="gpg">
+ <arg value="--armor"/>
+ <arg value="--output"/>
+ <arg value="@{output.file}"/>
+ <arg value="--detach-sig"/>
+ <arg value="@{input.file}"/>
+ </exec>
+ </sequential>
+ </macrodef>
+
+ <!-- Generates signatures and MD5 hashes for the release artifacts. -->
+ <target name="signeddist" depends="dist">
+
+ <checksum>
+ <fileset dir="${release.dir}"><include name="*.zip"/></fileset>
+ </checksum>
+
+ <sequential>
+ <sign-artifact input.file="${release.dir}/${ant.project.name}-${jspwiki.version}-bin.zip" />
+ <sign-artifact input.file="${release.dir}/${ant.project.name}-${jspwiki.version}-src.zip" />
+ </sequential>
+ </target>
+
<!-- ============================================================== -->
<!-- Running tests -->
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1241117&r1=1241116&r2=1241117&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Mon Feb 6 19:09:33 2012
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "4";
/**
* This is the generic version string you should use