knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject [2/2] git commit: KNOX-61: Change version number to 0.3.0 (cherry picked from commit abbe234d1af27de8fb98e56947399363db6877d9)
Date Wed, 02 Oct 2013 11:50:51 GMT
KNOX-61: Change version number to 0.3.0
(cherry picked from commit abbe234d1af27de8fb98e56947399363db6877d9)


Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/6ef000d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/6ef000d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/6ef000d0

Branch: refs/heads/master
Commit: 6ef000d0f980def110e3e9eda5a858cc0642fe6b
Parents: 4e0f7df
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Wed Oct 2 07:48:09 2013 -0400
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Wed Oct 2 07:50:35 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/6ef000d0/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 767908b..86ac9ea 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/6ef000d0/gateway-rpm/knox.spec
----------------------------------------------------------------------
diff --git a/gateway-rpm/knox.spec b/gateway-rpm/knox.spec
index 19e35d5..825ef58 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


Mime
View raw message