Minor release processes tweaks.
diff --git a/build.xml b/build.xml
index 800c5b5..ece957e 100644
--- a/build.xml
+++ b/build.xml
@@ -66,7 +66,8 @@
</exec>
</target>
- <target name="daily" depends="init" description="Perform the daily build.">
+ <target name="daily" depends="full" description="Perform the daily build."/>
+ <target name="full" depends="init" description="Perform a full build (aka daily).">
<exec executable="${mvn.cmd}">
<arg value="-Panalyze"/>
<arg value="-Prelease"/>
@@ -103,23 +104,23 @@
-->
<target name="sign" depends="init" description="Sign a previously created release.">
- <exec executable="gpg" dir="target/dist">
+ <exec executable="gpg" dir="target/${gateway-version}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
<arg value="${gateway-artifact}-${gateway-version}.zip"/>
</exec>
- <exec executable="gpg" dir="target/dist">
+ <exec executable="gpg" dir="target/${gateway-version}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
<arg value="${gateway-artifact}-${gateway-version}-src.zip"/>
</exec>
- <exec executable="gpg" dir="target/dist">
+ <exec executable="gpg" dir="target/${gateway-version}">
<arg value="--export"/>
<arg value="--armor"/>
<arg value="--output"/>
<arg value="KEYS"/>
</exec>
- <checksum file="target/dist/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA1" property="checksum" />
+ <checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA1" property="checksum" />
<copy file="src/vote.txt" tofile="target/vote.txt">
<filterchain>
<expandproperties/>
diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml
index 6bcaa12..f85d35b 100644
--- a/gateway-release/pom.xml
+++ b/gateway-release/pom.xml
@@ -53,7 +53,7 @@
<goals><goal>single</goal></goals>
<configuration>
<finalName>${gateway-artifact}-${gateway-version}</finalName>
- <outputDirectory>../target/dist</outputDirectory>
+ <outputDirectory>../target/${gateway-version}</outputDirectory>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly.xml</descriptor>
@@ -71,13 +71,13 @@
<configuration>
<tasks>
<checksum algorithm="MD5" fileext=".md5">
- <fileset dir="../target/dist">
+ <fileset dir="../target/${gateway-version}">
<include name="*.zip" />
<include name="*.tar.gz" />
</fileset>
</checksum>
<checksum algorithm="SHA1" fileext=".sha">
- <fileset dir="../target/dist">
+ <fileset dir="../target/${gateway-version}">
<include name="*.zip" />
<include name="*.tar.gz" />
</fileset>
diff --git a/pom.xml b/pom.xml
index 7ed6617..0b29060 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<goals><goal>single</goal></goals>
<configuration>
<finalName>${gateway-artifact}-${gateway-version}</finalName>
- <outputDirectory>target/dist</outputDirectory>
+ <outputDirectory>target/${gateway-version}</outputDirectory>
<descriptors>
<descriptor>src/assembly.xml</descriptor>
</descriptors>
diff --git a/src/stage.txt b/src/stage.txt
index 4f0117c..e71d3d4 100644
--- a/src/stage.txt
+++ b/src/stage.txt
@@ -1,6 +1,6 @@
The release candidate has been prepared in:
- target/dist
+ target/${gateway-version}
Please stage it to people.apache.org like this:
@@ -8,4 +8,4 @@
A release vote template has been generated here:
- target/vote.eml
+ target/vote.txt