Author: mattf
Date: Wed Feb 8 20:20:10 2012
New Revision: 1242075
URL: http://svn.apache.org/viewvc?rev=1242075&view=rev
Log:
HADOOP-8009. Create hadoop-client and hadoop-minicluster artifacts for
downstream projects. Contributed by Alejandro Abdelnur.
Added:
hadoop/common/branches/branch-1/ivy/hadoop-client-pom-template.xml
- copied unchanged from r1242072,
hadoop/common/branches/branch-1.0/ivy/hadoop-client-pom-template.xml
hadoop/common/branches/branch-1/ivy/hadoop-minicluster-pom-template.xml
- copied unchanged from r1242072,
hadoop/common/branches/branch-1.0/ivy/hadoop-minicluster-pom-template.xml
Modified:
hadoop/common/branches/branch-1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1/build.xml
Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1242075&r1=1242074&r2=1242075&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Feb 8 20:20:10 2012
@@ -155,7 +155,7 @@ Release 1.1.0 - unreleased
HDFS-2741. Document the max transfer threads property for branch-1.
Backport of HDFS-1866. (Markus Jelsma via harsh)
-Release 1.0.1 - 2012.01.30
+Release 1.0.1 - 2012.02.08
NEW FEATURES
@@ -173,6 +173,9 @@ Release 1.0.1 - 2012.01.30
HDFS-2814. NamenodeMXBean does not account for svn revision in the version
information. (Hitesh Shah via jitendra)
+ HADOOP-8009. Create hadoop-client and hadoop-minicluster artifacts for
+ downstream projects. (Alejandro Abdelnur via mattf)
+
BUG FIXES
HADOOP-7960. Port HADOOP-5203 to branch-1, build version comparison is too
Propchange: hadoop/common/branches/branch-1/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 8 20:20:10 2012
@@ -3,7 +3,7 @@
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1152887,1154413,1159730,1161741
/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt:1170696,1171234,1171294,1174368,1174370,1174917,1176042,1176248,1176638,1176645,1200050,1200078,1200199,1202378,1203419,1205530
-/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738,1214655,1214658,1214661,1214675,1238997
+/hadoop/common/branches/branch-1.0/CHANGES.txt:1208934,1209370,1211431,1211738,1214655,1214658,1214661,1214675,1238997,1242072
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-1/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/build.xml?rev=1242075&r1=1242074&r2=1242075&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/build.xml (original)
+++ hadoop/common/branches/branch-1/build.xml Wed Feb 8 20:20:10 2012
@@ -40,6 +40,8 @@
<property name="tools.final.name" value="${name}-tools-${version}"/>
<property name="ant.final.name" value="${name}-ant-${version}"/>
<property name="streaming.final.name" value="${name}-streaming-${version}"/>
+ <property name="hadoop-client.final.name" value="${name}-client-${version}"/>
+ <property name="hadoop-minicluster.final.name"
value="${name}-minicluster-${version}"/>
<property name="src.dir" value="${basedir}/src"/>
<property name="core.src.dir" value="${src.dir}/core"/>
@@ -256,6 +258,18 @@
location="${ivy.dir}/hadoop-streaming-pom-template.xml"/>
<property name="hadoop-streaming.jar"
location="${build.dir}/contrib/streaming/${streaming.final.name}.jar"/>
+ <property name="hadoop-client.pom"
+ location="${ivy.dir}/hadoop-client-pom.xml"/>
+ <property name="hadoop-client-pom-template.xml"
+ location="${ivy.dir}/hadoop-client-pom-template.xml"/>
+ <property name="hadoop-client.jar"
+ location="${build.dir}/${hadoop-client.final.name}.jar"/>
+ <property name="hadoop-minicluster.pom"
+ location="${ivy.dir}/hadoop-minicluster-pom.xml"/>
+ <property name="hadoop-minicluster-pom-template.xml"
+ location="${ivy.dir}/hadoop-minicluster-pom-template.xml"/>
+ <property name="hadoop-minicluster.jar"
+ location="${build.dir}/${hadoop-minicluster.final.name}.jar"/>
<!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.artifact.retrieve.pattern"
@@ -717,6 +731,27 @@
<fileset file="${jar.extra.properties.list}" />
<zipfileset dir="${build.webapps}" prefix="webapps"/>
</jar>
+ <mkdir dir="${build.dir}/empty"/>
+ <jar jarfile="${build.dir}/${hadoop-client.final.name}.jar"
+ basedir="${build.dir}/empty">
+ <manifest>
+ <section name="org/apache/hadoop">
+ <attribute name="Implementation-Title" value="Hadoop Client"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </section>
+ </manifest>
+ </jar>
+ <jar jarfile="${build.dir}/${hadoop-minicluster.final.name}.jar"
+ basedir="${build.dir}/empty">
+ <manifest>
+ <section name="org/apache/hadoop">
+ <attribute name="Implementation-Title" value="Hadoop Minicluster"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </section>
+ </manifest>
+ </jar>
</target>
<!-- ================================================================== -->
@@ -1882,6 +1917,8 @@
<delete file="${basedir}/ivy/hadoop-examples-pom.xml"/>
<delete file="${basedir}/ivy/hadoop-tools-pom.xml"/>
<delete file="${basedir}/ivy/hadoop-streaming-pom.xml"/>
+ <delete file="${basedir}/ivy/hadoop-client-pom.xml"/>
+ <delete file="${basedir}/ivy/hadoop-minicluster-pom.xml"/>
</target>
<target name="clean-sign" description="Clean. Delete .asc files">
@@ -2466,6 +2503,8 @@
<artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
<artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
<artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
+ <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
+ <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
<artifact:install file="${hadoop-core.jar}">
<pom refid="hadoop.core"/>
@@ -2482,6 +2521,12 @@
<artifact:install file="${hadoop-streaming.jar}">
<pom refid="hadoop.streaming"/>
</artifact:install>
+ <artifact:install file="${hadoop-client.jar}">
+ <pom refid="hadoop.client"/>
+ </artifact:install>
+ <artifact:install file="${hadoop-minicluster.jar}">
+ <pom refid="hadoop.minicluster"/>
+ </artifact:install>
</target>
<target name="mvn-deploy" depends="mvn-taskdef, bin-package, set-version,
signanddeploy, simpledeploy"
@@ -2493,6 +2538,8 @@
<artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
<artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
<artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
+ <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
+ <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
<artifact:install-provider artifactId="wagon-http"
version="${wagon-http.version}"/>
<artifact:deploy file="${hadoop-core.jar}">
@@ -2525,6 +2572,18 @@
<attach file="${hadoop-streaming.jar}.asc" type="jar.asc"/>
<attach file="${hadoop-streaming.pom}.asc" type="pom.asc"/>
</artifact:deploy>
+ <artifact:deploy file="${hadoop-client.jar}">
+ <remoteRepository id="apache.staging.https" url="${asfstagingrepo}"/>
+ <pom refid="hadoop.client"/>
+ <attach file="${hadoop-client.jar}.asc" type="jar.asc"/>
+ <attach file="${hadoop-client.pom}.asc" type="pom.asc"/>
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-minicluster.jar}">
+ <remoteRepository id="apache.minicluster.https"
url="${asfstagingrepo}"/>
+ <pom refid="hadoop.minicluster"/>
+ <attach file="${hadoop-minicluster.jar}.asc" type="jar.asc"/>
+ <attach file="${hadoop-minicluster.pom}.asc" type="pom.asc"/>
+ </artifact:deploy>
</target>
<target name="sign" depends="clean-sign" if="staging">
@@ -2568,6 +2627,10 @@
output.file="${hadoop-examples.pom}.asc"
gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${hadoop-streaming.pom}"
output.file="${hadoop-streaming.pom}.asc"
gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${hadoop-client.pom}"
+ output.file="${hadoop-client.pom}.asc"
gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${hadoop-minicluster.pom}"
+ output.file="${hadoop-minicluster.pom}.asc"
gpg.passphrase="${gpg.passphrase}"/>
</target>
<target name="simpledeploy" unless="staging">
@@ -2576,6 +2639,8 @@
<artifact:pom file="${hadoop-examples.pom}" id="hadoop.examples"/>
<artifact:pom file="${hadoop-tools.pom}" id="hadoop.tools"/>
<artifact:pom file="${hadoop-streaming.pom}" id="hadoop.streaming"/>
+ <artifact:pom file="${hadoop-client.pom}" id="hadoop.client"/>
+ <artifact:pom file="${hadoop-minicluster.pom}" id="hadoop.minicluster"/>
<artifact:install-provider artifactId="wagon-http"
version="${wagon-http.version}"/>
<artifact:deploy file="${hadoop-core.jar}">
@@ -2598,6 +2663,14 @@
<remoteRepository id="apache.snapshots.https"
url="${asfsnapshotrepo}"/>
<pom refid="hadoop.streaming"/>
</artifact:deploy>
+ <artifact:deploy file="${hadoop-client.jar}">
+ <remoteRepository id="apache.snapshots.https"
url="${asfsnapshotrepo}"/>
+ <pom refid="hadoop.client"/>
+ </artifact:deploy>
+ <artifact:deploy file="${hadoop-minicluster.jar}">
+ <remoteRepository id="apache.snapshots.https"
url="${asfsnapshotrepo}"/>
+ <pom refid="hadoop.minicluster"/>
+ </artifact:deploy>
</target>
<target name="set-version">
@@ -2606,11 +2679,15 @@
<delete file="${hadoop-examples.pom}"/>
<delete file="${hadoop-tools.pom}"/>
<delete file="${hadoop-streaming.pom}"/>
+ <delete file="${hadoop-client.pom}"/>
+ <delete file="${hadoop-minicluster.pom}"/>
<copy file="${hadoop-core-pom-template.xml}" tofile="${hadoop-core.pom}"/>
<copy file="${hadoop-test-pom-template.xml}" tofile="${hadoop-test.pom}"/>
<copy file="${hadoop-examples-pom-template.xml}"
tofile="${hadoop-examples.pom}"/>
<copy file="${hadoop-tools-pom-template.xml}"
tofile="${hadoop-tools.pom}"/>
<copy file="${hadoop-streaming-pom-template.xml}"
tofile="${hadoop-streaming.pom}"/>
+ <copy file="${hadoop-client-pom-template.xml}"
tofile="${hadoop-client.pom}"/>
+ <copy file="${hadoop-minicluster-pom-template.xml}"
tofile="${hadoop-minicluster.pom}"/>
<replaceregexp byline="true">
<regexp pattern="@version"/>
<substitution expression="${version}"/>
@@ -2620,6 +2697,8 @@
<include name="hadoop-tools-pom.xml"/>
<include name="hadoop-examples-pom.xml"/>
<include name="hadoop-streaming-pom.xml"/>
+ <include name="hadoop-client-pom.xml"/>
+ <include name="hadoop-minicluster-pom.xml"/>
</fileset>
</replaceregexp>
</target>
