You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by su...@apache.org on 2016/03/01 22:39:11 UTC

knox git commit: KNOX-667 Added maven profile and updated ant targets

Repository: knox
Updated Branches:
  refs/heads/master 3f5670db4 -> ffeb989b0


KNOX-667 Added maven profile and updated ant targets


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

Branch: refs/heads/master
Commit: ffeb989b0c50fdb78292a8b367fd883990f013c2
Parents: 3f5670d
Author: Sumit Gupta <su...@apache.org>
Authored: Tue Mar 1 16:38:27 2016 -0500
Committer: Sumit Gupta <su...@apache.org>
Committed: Tue Mar 1 16:38:27 2016 -0500

----------------------------------------------------------------------
 build.xml | 31 +++++++++++++++++++++++++++----
 pom.xml   |  8 +++++++-
 2 files changed, 34 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/ffeb989b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a2512e1..aaca7b5 100644
--- a/build.xml
+++ b/build.xml
@@ -36,7 +36,6 @@ Release build file for the Apache Knox Gateway
 
 <property name="svn.release.path" value="https://dist.apache.org/repos/dist/release/${gateway-project}" />
 <property name="svn.staging.path" value="https://dist.apache.org/repos/dist/dev/${gateway-project}" />
-
 <condition property="isUnix">
 <os family="unix"/>
 </condition>
@@ -108,10 +107,15 @@ Release build file for the Apache Knox Gateway
 </exec>
 </target>
 
-<target name="verify" depends="package" description="Perform the verification build."/>
+<target name="verify" depends="_init" description="Perform the verification build.">
+    <exec executable="${mvn.cmd}">
+        <arg value="clean"/>
+        <arg value="verify"/>
+    </exec>
+</target>
 <target name="package" depends="_init" description="Build and package the product (aka verify).">
 <exec executable="${mvn.cmd}">
-    <arg value="-Prelease"/>
+    <arg value="-Ppackage"/>
     <arg value="clean"/>
     <arg value="install"/>
 </exec>
@@ -119,6 +123,16 @@ Release build file for the Apache Knox Gateway
     <fileset file="CHANGES"/>
 </copy>
 </target>
+<target name="quick-package" depends="_init" description="Build and package the product (aka verify).">
+<exec executable="${mvn.cmd}">
+    <arg value="-DskipTests"/>
+    <arg value="-Ppackage"/>
+    <arg value="install"/>
+</exec>
+<copy todir="target/${gateway-version}">
+    <fileset file="CHANGES"/>
+</copy>
+</target>
 
 <target name="daily" depends="full" description="Perform the daily build."/>
 <target name="full" depends="_init" description="Perform a full build (aka daily).">
@@ -250,7 +264,16 @@ Release build file for the Apache Knox Gateway
         <echo message="${stage-message}"/>
     </target>
 
-    <target name="release" depends="package" description="Build release artifacts and sign."/>
+    <target name="release" depends="_init">
+        <exec executable="${mvn.cmd}">
+            <arg value="-Ppackage,release"/>
+            <arg value="clean"/>
+            <arg value="install"/>
+        </exec>
+        <copy todir="target/${gateway-version}">
+            <fileset file="CHANGES"/>
+        </copy>
+    </target>
 
     <target name="stage-candidate" depends="_username,_password,unstage-candidate" description="Stage release artifacts.">
         <exec executable="svn">

http://git-wip-us.apache.org/repos/asf/knox/blob/ffeb989b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c87486a..67c20bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
             </build>
         </profile>
         <profile>
-            <id>release</id>
+            <id>package</id>
             <build>
                 <plugins>
                     <plugin>
@@ -175,6 +175,12 @@
                 </plugins>
             </build>
             <properties>
+                <failsafe.group>org.apache.hadoop.test.category.VerifyTest</failsafe.group>
+            </properties>
+        </profile>
+        <profile>
+            <id>release</id>
+            <properties>
                 <failsafe.group>org.apache.hadoop.test.category.VerifyTest,org.apache.hadoop.test.category.ReleaseTest</failsafe.group>
             </properties>
         </profile>