Author: bodewig
Date: Sat Jan 18 13:53:17 2014
New Revision: 1559344
URL: http://svn.apache.org/r1559344
Log:
Add site publication and building a Nexus Upload Bundle
Modified:
commons/proper/lang/trunk/default.properties
commons/proper/lang/trunk/src/release-tools/build.properties.sample
commons/proper/lang/trunk/src/release-tools/build.xml
Modified: commons/proper/lang/trunk/default.properties
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?rev=1559344&r1=1559343&r2=1559344&view=diff
==============================================================================
--- commons/proper/lang/trunk/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Sat Jan 18 13:53:17 2014
@@ -42,7 +42,7 @@ component.package = org.apache.commons.l
component.title = Core Language Utilities
# The current version number of this component
-component.version = 3.2.2-SNAPSHOT
+component.version = 3.3-SNAPSHOT
# The name that is used to create the jar file
final.name = ${component.name}-${component.version}
Modified: commons/proper/lang/trunk/src/release-tools/build.properties.sample
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/release-tools/build.properties.sample?rev=1559344&r1=1559343&r2=1559344&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/release-tools/build.properties.sample
(original)
+++ commons/proper/lang/trunk/src/release-tools/build.properties.sample Sat Jan
18 13:53:17 2014
@@ -16,7 +16,10 @@
# Sample Ant build.properties file for creating RCs and releasing
##########################################################################
-# Your apache ID - it is used for the Build-By MANIFEST header, when creating
the RC jars
+# Your apache ID - it is used for the Build-By MANIFEST header, when
+# creating the RC jars and when uploading the website
apache.id=luckyRM
-# directory to use when crating the release
-release.path=${user.home}/lang-rc
\ No newline at end of file
+# checkout directory for the release distribution repo
+release.path=${user.home}/lang-rc
+# SSH keyfile holding the private key
+ssh.keyfile=${user.home}/.ssh/id_rsa
Modified: commons/proper/lang/trunk/src/release-tools/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/release-tools/build.xml?rev=1559344&r1=1559343&r2=1559344&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/release-tools/build.xml (original)
+++ commons/proper/lang/trunk/src/release-tools/build.xml Sat Jan 18 13:53:17
2014
@@ -30,6 +30,7 @@
<!-- provide some defaults -->
<property name="release.path" value="${user.home}/lang-rc" />
<property name="apache.id" value="[email protected]" />
+ <property name="ssh.keyfile" value="${user.home}/.ssh/id_rsa"/>
<property name="release.url"
value="https://dist.apache.org/repos/dist/dev/commons/lang"; />
<macrodef name="mvn">
@@ -77,7 +78,7 @@
</target>
<target name="-populate-dist-repo"
- depends="pre-rc, -build-maven-artifacts, -prepare-dist-area">
+ depends="-build-maven-artifacts, -prepare-dist-area">
<copy todir="${release.path}/binaries">
<fileset dir="${repo.path}">
<include name="*bin.zip*" />
@@ -103,6 +104,42 @@
<mvn goal="site"/>
</target>
+ <target name="upload-site" depends="-init"
+ description="Uploads and publishes the site to the RM's apache
webspace">
+ <zip destfile="target/site.zip">
+ <zipfileset dir="target/site" prefix="${final.name}"/>
+ </zip>
+
+ <input message="Please enter ssh passphrase..." addproperty="ssh.pass">
+ <handler type="secure" />
+ </input>
+
+ <scp localFile="target/site.zip"
+ remoteToDir="${apache.id}@people.apache.org:."
+ keyfile="${ssh.keyfile}"
+ passphrase="${ssh.pass}"/>
+ <sshexec username="${apache.id}" host="people.apache.org"
+ command="unzip -d public_html site.zip"
+ keyfile="${ssh.keyfile}"
+ passphrase="${ssh.pass}"/>
+ <sshexec username="${apache.id}" host="people.apache.org"
+ command="rm site.zip"
+ keyfile="${ssh.keyfile}"
+ passphrase="${ssh.pass}"/>
+ </target>
+
+ <target name="nexus-bundle" depends="-build-maven-artifacts"
+ description="Creates an upload bundle suitable for Nexus Snapshot
Upload">
+ <jar destfile="target/upload-bundle.jar">
+ <fileset dir="${repo.path}">
+ <include name="*.jar"/>
+ <include name="*.jar.asc"/>
+ <include name="*.pom"/>
+ <include name="*.pom.asc"/>
+ </fileset>
+ </jar>
+ </target>
+
<target name="-prepare-dist-area" depends="-checkout-dist, -update-dist"/>
<target name="-checkout-dist" depends="-init" unless="dist-dir-exists?">
