You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/10/02 13:48:13 UTC
[1/2] git commit: Add target to kick of a remote build.
Updated Branches:
refs/heads/v0.3.0 7a6c93412 -> abbe234d1
Add target to kick of a remote build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/785f376c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/785f376c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/785f376c
Branch: refs/heads/v0.3.0
Commit: 785f376cf40c095ae241a3e0da1b5ba5aaa18837
Parents: 7a6c934
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Oct 1 17:42:19 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Oct 1 17:42:19 2013 -0400
----------------------------------------------------------------------
build.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/785f376c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2336991..5047281 100644
--- a/build.xml
+++ b/build.xml
@@ -53,6 +53,13 @@
<os family="windows" />
</condition>
+ <condition property="curl.cmd" value="curl">
+ <os family="unix" />
+ </condition>
+ <condition property="curl.cmd" value="curl">
+ <os family="windows" />
+ </condition>
+
<condition property="rpm-builder" value="./gateway-rpm/build_knox_rpm.sh">
<os family="unix" />
</condition>
@@ -117,6 +124,15 @@
<checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}.rpm" algorithm="SHA1" fileext=".sha" forceOverwrite="yes"/>
</target>
+ <target name="remote-build">
+ <exec executable="${curl.cmd}">
+ <arg value="--silent"/>
+ <arg value="--request"/>
+ <arg value="POST"/>
+ <arg value="https://builds.apache.org/job/Knox-${gateway-version}/build?token=knox-remote-build-token"/>
+ </exec>
+ </target>
+
<target name="download-build">
<mkdir dir="${candidate.path}"/>
<get dest="${candidate.path}">
[2/2] git commit: KNOX-61: Change version number to 0.3.0
Posted by km...@apache.org.
KNOX-61: Change version number to 0.3.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/abbe234d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/abbe234d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/abbe234d
Branch: refs/heads/v0.3.0
Commit: abbe234d1af27de8fb98e56947399363db6877d9
Parents: 785f376
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Wed Oct 2 07:48:09 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Wed Oct 2 07:48:09 2013 -0400
----------------------------------------------------------------------
build.xml | 28 ++++++++++++++--------------
gateway-rpm/knox.spec | 2 +-
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/abbe234d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 5047281..24018c8 100644
--- a/build.xml
+++ b/build.xml
@@ -64,16 +64,16 @@
<os family="unix" />
</condition>
- <target name="init" description="Initialize the build.">
+ <target name="_init" description="Initialize the build.">
</target>
- <target name="clean" depends="init" description="Clean up any build artifacts.">
+ <target name="clean" depends="_init" description="Clean up any build artifacts.">
<delete file="target"/>
<delete file="install"/>
<delete file="${candidate.path}"/>
</target>
- <target name="build" depends="init" description="Build the product.">
+ <target name="build" depends="_init" description="Build the product.">
<exec executable="${mvn.cmd}">
<arg value="clean"/>
<arg value="install"/>
@@ -81,7 +81,7 @@
</target>
<target name="verify" depends="package" description="Perform the verification build."/>
- <target name="package" depends="init" description="Build and package the product (aka verify).">
+ <target name="package" depends="_init" description="Build and package the product (aka verify).">
<exec executable="${mvn.cmd}">
<arg value="-Prelease"/>
<arg value="clean"/>
@@ -94,7 +94,7 @@
</target>
<target name="daily" depends="full" description="Perform the daily build."/>
- <target name="full" depends="init" description="Perform a full build (aka daily).">
+ <target name="full" depends="_init" description="Perform a full build (aka daily).">
<exec executable="${mvn.cmd}">
<arg value="-Panalyze"/>
<arg value="-Prelease"/>
@@ -102,9 +102,9 @@
</exec>
</target>
- <target name="post-build" depends="init,_rpm,_changes"/>
+ <target name="post-build" depends="_init,_rpm,_changes"/>
- <target name="_changes" depends="init">
+ <target name="_changes" depends="_init">
<copy file="gateway-release/home/CHANGES" todir="target/${gateway-version}"/>
</target>
@@ -113,7 +113,7 @@
</target>
<target name="rpm" depends="package,_rpm" description="Package and build RPM of the product."/>
- <target name="_rpm" depends="init,set-rpm-builder-privs" description="Build RPM of the product from existing package.">
+ <target name="_rpm" depends="_init,set-rpm-builder-privs" description="Build RPM of the product from existing package.">
<exec executable="${rpm-builder}">
<arg value="target"/>
<arg value="${gateway-artifact}"/>
@@ -124,7 +124,7 @@
<checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}.rpm" algorithm="SHA1" fileext=".sha" forceOverwrite="yes"/>
</target>
- <target name="remote-build">
+ <target name="build-candidate">
<exec executable="${curl.cmd}">
<arg value="--silent"/>
<arg value="--request"/>
@@ -133,7 +133,7 @@
</exec>
</target>
- <target name="download-build">
+ <target name="download-candidate">
<mkdir dir="${candidate.path}"/>
<get dest="${candidate.path}">
<url url="${build-url}/knox-incubating-${gateway-version}.zip"/>
@@ -152,7 +152,10 @@
</get>
</target>
- <target name="sign-candidate" depends="init" description="Sign a previously created release.">
+ <target name="sign-candidate" depends="_init" description="Sign a downloaded created release.">
+ <delete>
+ <fileset dir="${candidate.path}" includes="**/*.asc"/>
+ </delete>
<exec executable="gpg" dir="${candidate.path}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
@@ -168,9 +171,6 @@
<arg value="--detach-sig"/>
<arg value="${gateway-artifact}-${gateway-version}.tar.gz"/>
</exec>
- <!--
- <checksum file="target/${gateway-version}/${gateway-artifact}-${gateway-version}-src.zip" algorithm="SHA1" property="checksum"/>
- -->
<exec executable="gpg" dir="${candidate.path}">
<arg value="--armor"/>
<arg value="--detach-sig"/>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/abbe234d/gateway-rpm/knox.spec
----------------------------------------------------------------------
diff --git a/gateway-rpm/knox.spec b/gateway-rpm/knox.spec
index 4fedc52..6103d45 100644
--- a/gateway-rpm/knox.spec
+++ b/gateway-rpm/knox.spec
@@ -21,7 +21,7 @@
Summary: Knox
Name: %_knox_name
-Version: 0.0.0
+Version: %_knox_ver
Release: 1
License: Apache License, Version 2.0
Group: Applications/Server