From mapreduce-commits-return-1185-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org Tue Jan 11 19:23:46 2011
Return-Path: <mapreduce-commits-return-1185-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 87091 invoked from network); 11 Jan 2011 19:23:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Jan 2011 19:23:46 -0000
Received: (qmail 64157 invoked by uid 500); 11 Jan 2011 19:23:46 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 64044 invoked by uid 500); 11 Jan 2011 19:23:45 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 64036 invoked by uid 99); 11 Jan 2011 19:23:45 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 19:23:45 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 19:23:38 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A192823888CF; Tue, 11 Jan 2011 19:23:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1057811 - in /hadoop/mapreduce/branches/branch-0.22:
 CHANGES.txt build.xml ivy/libraries.properties
Date: Tue, 11 Jan 2011 19:23:11 -0000
To: mapreduce-commits@hadoop.apache.org
From: tomwhite@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110111192311.A192823888CF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tomwhite
Date: Tue Jan 11 19:23:11 2011
New Revision: 1057811

URL: http://svn.apache.org/viewvc?rev=1057811&view=rev
Log:
Merge -r 1057805:1057806 from trunk to branch-0.22. Fixes: MAPREDUCE-1929.

Modified:
    hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.22/build.xml
    hadoop/mapreduce/branches/branch-0.22/ivy/libraries.properties

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1057811&r1=1057810&r2=1057811&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Tue Jan 11 19:23:11 2011
@@ -454,6 +454,9 @@ Release 0.21.1 - Unreleased
 
     MAPREDUCE-2228. Remove java5 dependencies from build. (cos)
 
+    MAPREDUCE-1929. Allow artifacts to be published to the staging Apache Nexus
+    Maven Repository. (tomwhite)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/branches/branch-0.22/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/build.xml?rev=1057811&r1=1057810&r2=1057811&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.22/build.xml Tue Jan 11 19:23:11 2011
@@ -181,8 +181,10 @@
   <loadproperties srcfile="${ivy.dir}/libraries.properties"/>
   <property name="mvn.repo" value="http://repo2.maven.org/maven2"/>
   <property name="ivy.jar" location="${ivy.dir}/ivy-${ivy.version}.jar"/>
-  <property name="repo" value="snapshots"/>
-  <property name="asfrepo" value="https://repository.apache.org/content/repositories/${repo}"/>
+  <property name="asfrepo" value="https://repository.apache.org"/>
+  <property name="asfsnapshotrepo" value="${asfrepo}/content/repositories/snapshots"/>
+  <property name="asfstagingrepo"
+    value="${asfrepo}/service/local/staging/deploy/maven2"/>
   <property name="ant_task.jar" location="${ivy.dir}/maven-ant-tasks-${ant-task.version}.jar"/>
   <property name="ant_task_repo_url" value="${mvn.repo}/org/apache/maven/maven-ant-tasks/${ant-task.version}/maven-ant-tasks-${ant-task.version}.jar"/>
   <property name="ivy_repo_url" value="${mvn.repo}/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
@@ -242,6 +244,10 @@
     </and>
   </condition>
 
+  <condition property="staging">
+    <equals arg1="${repo}" arg2="staging"/>
+  </condition>
+
   <!-- the normal classpath -->
   <path id="classpath">
     <pathelement location="${build.classes}"/>
@@ -1367,128 +1373,168 @@
     <delete dir="${user.home}/.ivy2/cache/org.apache.hadoop/hadoop-hdfs-test"/>
   </target>
 
-  <target name="mvn-install-mapred" depends="mvn-taskdef,examples,tools,set-version">
-     <artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
-     <artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
-     <artifact:pom file="${hadoop-mapred-tools.pom}" id="hadoop.mapred.tools"/>
+  <target name="mvn-install" depends="mvn-taskdef,jar,jar-test,set-version,-mvn-system-install"
+      description="To install hadoop mapreduce and test jars to local filesystem's m2 cache">
+    <artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
+    <artifact:pom file="${hadoop-mapred-test.pom}" id="hadoop.mapred.test"/>
+    <artifact:install file="${hadoop-mapred.jar}">
+      <pom refid="hadoop.mapred"/>
+      <attach file="${hadoop-mapred-sources.jar}" classifier="sources" />
+    </artifact:install>
+    <artifact:install file="${hadoop-mapred-test.jar}">
+      <pom refid="hadoop.mapred.test"/>
+      <attach file="${hadoop-mapred-test-sources.jar}" classifier="sources" />
+    </artifact:install>
+  </target>
+
+  <target name="mvn-deploy" depends="mvn-taskdef, jar, jar-test,
+    jar-system, jar-test-system, set-version, signanddeploy, simpledeploy"
+    description="To deploy hadoop mapredice and test jar's to apache
+    snapshot's repository"/>
 
-     <artifact:install file="${hadoop-mapred.jar}">
-        <pom refid="hadoop.mapred"/>
-	<attach file="${hadoop-mapred-sources.jar}" classifier="sources" />
-     </artifact:install>
-     <artifact:install file="${hadoop-mapred-examples.jar}">
-        <pom refid="hadoop.mapred.examples"/>
-	<attach file="${hadoop-mapred-examples-sources.jar}" classifier="sources" />
-     </artifact:install>
-     <artifact:install file="${hadoop-mapred-tools.jar}">
-        <pom refid="hadoop.mapred.tools"/>
-	<attach file="${hadoop-mapred-tools-sources.jar}" classifier="sources" />
-     </artifact:install>
-  </target>
-
-  <target name="mvn-install" depends="mvn-taskdef,examples,tools,jar-test,set-version,
-    -mvn-system-install">
+   <target name="signanddeploy" if="staging" depends="sign">
      <artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
      <artifact:pom file="${hadoop-mapred-test.pom}" id="hadoop.mapred.test"/>
-     <artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
-     <artifact:pom file="${hadoop-mapred-tools.pom}" id="hadoop.mapred.tools"/>
-     <artifact:install file="${hadoop-mapred.jar}">
-        <pom refid="hadoop.mapred"/>
-	<attach file="${hadoop-mapred-sources.jar}" classifier="sources" />
-     </artifact:install>
-     <artifact:install file="${hadoop-mapred-test.jar}">
-        <pom refid="hadoop.mapred.test"/>
-	<attach file="${hadoop-mapred-test-sources.jar}" classifier="sources" />
-     </artifact:install>
-     <artifact:install file="${hadoop-mapred-examples.jar}">
-        <pom refid="hadoop.mapred.examples"/>
-	<attach file="${hadoop-mapred-examples-sources.jar}" classifier="sources" />
-     </artifact:install>
-     <artifact:install file="${hadoop-mapred-tools.jar}">
-        <pom refid="hadoop.mapred.tools"/>
-	<attach file="${hadoop-mapred-tools-sources.jar}" classifier="sources" />
-     </artifact:install>
+     <artifact:pom file="${hadoop-mapred-instrumented.pom}" 
+       id="hadoop.mapred.${herriot.suffix}"/>
+     <artifact:pom file="${hadoop-mapred-instrumented-test.pom}" 
+       id="hadoop.mapred.${herriot.suffix}.test"/>
+     <artifact:install-provider artifactId="wagon-http"
+     version="${wagon-http.version}"/>
+
+     <artifact:deploy file="${hadoop-mapred.jar}">
+       <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+       <pom refid="hadoop.mapred"/>
+       <attach file="${hadoop-mapred.jar}.asc" type="jar.asc"/>
+       <attach file="${hadoop-mapred.pom}.asc" type="pom.asc"/>
+       <attach file="${hadoop-mapred-sources.jar}.asc" type="jar.asc"
+         classifier="sources" />
+       <attach file="${hadoop-mapred-sources.jar}" classifier="sources"/>
+     </artifact:deploy>
+
+     <artifact:deploy file="${hadoop-mapred-test.jar}">
+       <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+       <pom refid="hadoop.mapred.test"/>
+       <attach file="${hadoop-mapred-test.jar}.asc" type="jar.asc"/>
+       <attach file="${hadoop-mapred-test.pom}.asc" type="pom.asc"/>
+       <attach file="${hadoop-mapred-test-sources.jar}.asc" type="jar.asc"
+         classifier="sources"/>
+       <attach file="${hadoop-mapred-test-sources.jar}" classifier="sources"/>
+     </artifact:deploy>
+
+     <artifact:deploy file="${hadoop-mapred-instrumented.jar}">
+       <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+       <pom refid="hadoop.mapred.${herriot.suffix}"/>
+       <attach file="${hadoop-mapred-instrumented.jar}.asc" type="jar.asc"/>
+       <attach file="${hadoop-mapred-instrumented.pom}.asc" type="pom.asc"/>
+       <attach file="${hadoop-mapred-instrumented-sources.jar}.asc" 
+         type="jar.asc" classifier="sources"/>
+       <attach file="${hadoop-mapred-instrumented-sources.jar}"
+         classifier="sources"/>
+     </artifact:deploy>
+
+      <artifact:deploy file="${hadoop-mapred-instrumented-test.jar}">
+       <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+       <pom refid="hadoop.mapred.${herriot.suffix}.test"/>
+       <attach file="${hadoop-mapred-instrumented-test.jar}.asc" type="jar.asc"/>
+       <attach file="${hadoop-mapred-instrumented-test.pom}.asc" type="pom.asc"/>
+       <attach file="${hadoop-mapred-instrumented-test-sources.jar}.asc" 
+         type="jar.asc" classifier="sources"/>
+       <attach file="${hadoop-mapred-instrumented-test-sources.jar}"
+         classifier="sources"/>
+     </artifact:deploy>
+   </target>
+
+   <target name="sign" depends="clean-sign" if="staging">
+    <input message="password:>" addproperty="gpg.passphrase">
+     <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
+    </input>
+    <macrodef name="sign-artifact" description="Signs the artifact">
+      <attribute name="input.file"/>
+      <attribute name="output.file" default="@{input.file}.asc"/>
+      <attribute name="gpg.passphrase"/>
+      <sequential>
+        <echo>Signing @{input.file} Sig File: @{output.file}</echo>
+        <exec executable="gpg" >
+          <arg value="--armor"/>
+          <arg value="--output"/>
+          <arg value="@{output.file}"/>
+          <arg value="--passphrase"/>
+          <arg value="@{gpg.passphrase}"/>
+          <arg value="--detach-sig"/>
+          <arg value="@{input.file}"/>
+        </exec>
+      </sequential>
+    </macrodef>
+    <sign-artifact input.file="${hadoop-mapred.jar}" 
+     output.file="${hadoop-mapred.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-test.jar}" 
+     output.file="${hadoop-mapred-test.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-sources.jar}" 
+     output.file="${hadoop-mapred-sources.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-test-sources.jar}" 
+     output.file="${hadoop-mapred-test-sources.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred.pom}" 
+     output.file="${hadoop-mapred.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-test.pom}" 
+     output.file="${hadoop-mapred-test.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-instrumented.jar}" 
+     output.file="${hadoop-mapred-instrumented.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-instrumented.pom}" 
+     output.file="${hadoop-mapred-instrumented.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-instrumented-sources.jar}" 
+     output.file="${hadoop-mapred-instrumented-sources.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-instrumented-test.jar}" 
+     output.file="${hadoop-mapred-instrumented-test.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-instrumented-test.pom}" 
+     output.file="${hadoop-mapred-instrumented-test.pom}.asc" gpg.passphrase="${gpg.passphrase}"/>
+    <sign-artifact input.file="${hadoop-mapred-instrumented-test-sources.jar}" 
+     output.file="${hadoop-mapred-instrumented-test-sources.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
   </target>
 
-  <target name="mvn-deploy" depends="mvn-taskdef, examples, tools, jar-test, set-version,
-    -mvn-system-deploy">
+  <target name="simpledeploy" unless="staging">
      <artifact:pom file="${hadoop-mapred.pom}" id="hadoop.mapred"/>
      <artifact:pom file="${hadoop-mapred-test.pom}" id="hadoop.mapred.test"/>
-     <artifact:pom file="${hadoop-mapred-examples.pom}" id="hadoop.mapred.examples"/>
-     <artifact:pom file="${hadoop-mapred-tools.pom}" id="hadoop.mapred.tools"/>
+     <artifact:pom file="${hadoop-mapred-instrumented.pom}" 
+       id="hadoop.mapred.${herriot.suffix}"/>
 
-     <artifact:install-provider artifactId="wagon-http" version="1.0-beta-2"/>
+     <artifact:install-provider artifactId="wagon-http" version="${wagon-http.version}"/>
      <artifact:deploy file="${hadoop-mapred.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
+         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
          <pom refid="hadoop.mapred"/>
-	 <attach file="${hadoop-mapred-sources.jar}" classifier="sources" />
+         <attach file="${hadoop-mapred-sources.jar}" classifier="sources" />
      </artifact:deploy>
+
      <artifact:deploy file="${hadoop-mapred-test.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
+         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
          <pom refid="hadoop.mapred.test"/>
-	 <attach file="${hadoop-mapred-test-sources.jar}" classifier="sources" />
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-mapred-examples.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
-         <pom refid="hadoop.mapred.examples"/>
-	 <attach file="${hadoop-mapred-examples-sources.jar}" classifier="sources" />
-     </artifact:deploy>
-     <artifact:deploy file="${hadoop-mapred-tools.jar}">
-         <remoteRepository id="apache.snapshots.https" url="${asfrepo}"/>
-         <pom refid="hadoop.mapred.tools"/>
-	 <attach file="${hadoop-mapred-tools-sources.jar}" classifier="sources" />
+         <attach file="${hadoop-mapred-test-sources.jar}" classifier="sources" />
+     </artifact:deploy> 
+
+     <artifact:deploy file="${hadoop-mapred-instrumented.jar}">
+         <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
+         <pom refid="hadoop.mapred.${herriot.suffix}"/>
+         <attach file="${hadoop-mapred-instrumented-sources.jar}" classifier="sources" />
      </artifact:deploy>
   </target>
-  
+
   <target name="set-version">
     <delete file="${basedir}/ivy/hadoop-mapred.xml"/>
     <delete file="${basedir}/ivy/hadoop-mapred-test.xml"/>
     <delete file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}.xml"/>
     <delete file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-test.xml"/>
-    <delete file="${basedir}/ivy/hadoop-mapred-examples.xml"/>
-    <delete file="${basedir}/ivy/hadoop-mapred-tools.xml"/>
-    <delete file="${hadoop-mapred-instrumented.pom}"/>
     <copy file="${basedir}/ivy/hadoop-mapred-template.xml" tofile="${basedir}/ivy/hadoop-mapred.xml"/>
     <copy file="${basedir}/ivy/hadoop-mapred-test-template.xml" tofile="${basedir}/ivy/hadoop-mapred-test.xml"/>
     <copy file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-template.xml"
-          tofile="${basedir}/ivy/hadoop-mapred-${herriot.suffix}.xml"/>
+      tofile="${basedir}/ivy/hadoop-mapred-${herriot.suffix}.xml"/>
     <copy file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-test-template.xml"
-          tofile="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-test.xml"/>
-    <copy file="${basedir}/ivy/hadoop-mapred-examples-template.xml" tofile="${basedir}/ivy/hadoop-mapred-examples.xml"/>
-    <copy file="${basedir}/ivy/hadoop-mapred-tools-template.xml" tofile="${basedir}/ivy/hadoop-mapred-tools.xml"/>
-    <copy file="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-template.xml" tofile="${hadoop-mapred-instrumented.pom}"/>
+      tofile="${basedir}/ivy/hadoop-mapred-${herriot.suffix}-test.xml"/>
     <replaceregexp byline="true">
       <regexp pattern="@version"/>
       <substitution expression="${version}"/>
       <fileset dir="${basedir}/ivy">
         <include name="hadoop-mapred.xml"/>
-      </fileset>
-    </replaceregexp>
-    <replaceregexp byline="true">
-      <regexp pattern="@version"/>
-      <substitution expression="${version}"/>
-      <fileset dir="${basedir}/ivy">
         <include name="hadoop-mapred-test.xml"/>
-      </fileset>
-    </replaceregexp>
-    <replaceregexp byline="true">
-      <regexp pattern="@version"/>
-      <substitution expression="${version}"/>
-      <fileset dir="${basedir}/ivy">
-        <include name="hadoop-mapred-examples.xml"/>
-      </fileset>
-    </replaceregexp>
-    <replaceregexp byline="true">
-      <regexp pattern="@version"/>
-      <substitution expression="${version}"/>
-      <fileset dir="${basedir}/ivy">
-        <include name="hadoop-mapred-tools.xml"/>
-      </fileset>
-    </replaceregexp>
-    <replaceregexp byline="true">
-      <regexp pattern="@version"/>
-      <substitution expression="${version}"/>
-      <fileset dir="${basedir}/ivy">
         <include name="hadoop-mapred-${herriot.suffix}.xml"/>
         <include name="hadoop-mapred-${herriot.suffix}-test.xml"/>
       </fileset>
@@ -1536,7 +1582,7 @@
   <!-- ================================================================== -->
   <!-- Clean.  Delete the build files, and their directories              -->
   <!-- ================================================================== -->
-  <target name="clean" depends="clean-contrib, clean-fi" description="Clean.  Delete the build files, and their directories">
+  <target name="clean" depends="clean-contrib, clean-fi, clean-sign" description="Clean.  Delete the build files, and their directories">
     <delete dir="${build.dir}"/>
     <delete dir="${docs.src}/build"/>
     <delete file="${hadoop-mapred.pom}"/>
@@ -1547,6 +1593,12 @@
     <delete file="${hadoop-mapred-tools.pom}"/>
   </target>
 
+  <target name="clean-sign" description="Clean.  Delete .asc files">
+    <delete>
+      <fileset dir="." includes="**/**/*.asc"/>
+    </delete>
+  </target>
+
   <target name="veryclean" depends="clean-cache,clean" 
           description="veryclean.  Delete ivy and ant maven task jar">
     <delete file="${ant_task.jar}"/>

Modified: hadoop/mapreduce/branches/branch-0.22/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/ivy/libraries.properties?rev=1057811&r1=1057810&r2=1057811&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/branch-0.22/ivy/libraries.properties Tue Jan 11 19:23:11 2011
@@ -76,6 +76,7 @@ servlet-api.version=2.5
 slf4j-api.version=1.5.11
 slf4j-log4j12.version=1.5.11
 
+wagon-http.version=1.0-beta-2
 xmlenc.version=0.52
 xerces.version=1.4.4