You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/04 05:06:42 UTC
svn commit: r1077356 - in
/hadoop/common/branches/branch-0.20-security-patches: build.xml
ivy/hadoop-core-pom-template.xml ivy/hadoop-examples-pom-template.xml
ivy/hadoop-tools-pom-template.xml
Author: omalley
Date: Fri Mar 4 04:06:41 2011
New Revision: 1077356
URL: http://svn.apache.org/viewvc?rev=1077356&view=rev
Log:
commit 662b4eca8aedb4c0e52057b4caaf7e5db8faec31
Author: Yahoo\! <lt...@yahoo-inc.com>
Date: Mon Mar 22 09:56:47 2010 -0700
HADOOP-6382 (ported from 0.20.9.1) correct maven publishing artifacts (gkesavan via ltucker)
https://issues.apache.org/jira/secure/attachment/12439185/h20-v3tov5.patch
Modified:
hadoop/common/branches/branch-0.20-security-patches/build.xml
hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-core-pom-template.xml
hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-examples-pom-template.xml
hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-tools-pom-template.xml
Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077356&r1=1077355&r2=1077356&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar 4 04:06:41 2011
@@ -234,8 +234,6 @@
<!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="hadoop-[revision]-core.[ext]"/>
- <property name="hadoop.jar"
- location="${build.dir}/hadoop-${hadoop.version}-core.jar"/>
<!-- jdiff.home property set -->
<property name="jdiff.home"
@@ -1260,7 +1258,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="compile, jar, javadoc, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
+ <target name="package" depends="compile, jar, javadoc, docs, cn-docs, api-report, examples, tools-jar, jar-test, ant-tasks, package-librecordio"
description="Build distribution">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
@@ -2090,7 +2088,6 @@
</exec>
</sequential>
</macrodef>
- <echo> phassphrase : ${gpg.passphrase} </echo>
<sign-artifact input.file="${hadoop-core.jar}"
output.file="${hadoop-core.jar}.asc" gpg.passphrase="${gpg.passphrase}"/>
<sign-artifact input.file="${hadoop-test.jar}"
@@ -2126,7 +2123,7 @@
<pom refid="hadoop.core"/>
</artifact:deploy>
<artifact:deploy file="${hadoop-test.jar}">
- <remoteRepository id="apache.snapshosts.https" url="${asfsnapshotrepo}"/>
+ <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
<pom refid="hadoop.test"/>
</artifact:deploy>
<artifact:deploy file="${hadoop-examples.jar}">
@@ -2138,7 +2135,7 @@
<pom refid="hadoop.tools"/>
</artifact:deploy>
<artifact:deploy file="${hadoop-streaming.jar}">
- <remoteRepository id="apache.snapshosts.https" url="${asfsnapshotrepo}"/>
+ <remoteRepository id="apache.snapshots.https" url="${asfsnapshotrepo}"/>
<pom refid="hadoop.streaming"/>
</artifact:deploy>
</target>
Modified: hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-core-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-core-pom-template.xml?rev=1077356&r1=1077355&r2=1077356&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-core-pom-template.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-core-pom-template.xml Fri Mar 4 04:06:41 2011
@@ -104,11 +104,6 @@
<version>0.3</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.10</version>
Modified: hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-examples-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-examples-pom-template.xml?rev=1077356&r1=1077355&r2=1077356&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-examples-pom-template.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-examples-pom-template.xml Fri Mar 4 04:06:41 2011
@@ -24,5 +24,11 @@
<artifactId>hadoop-examples</artifactId>
<packaging>jar</packaging>
<version>@version</version>
- <dependencies/>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>@version</version>
+ </dependency>
+ </dependencies>
</project>
Modified: hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-tools-pom-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-tools-pom-template.xml?rev=1077356&r1=1077355&r2=1077356&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-tools-pom-template.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/ivy/hadoop-tools-pom-template.xml Fri Mar 4 04:06:41 2011
@@ -24,5 +24,11 @@
<artifactId>hadoop-tools</artifactId>
<packaging>jar</packaging>
<version>@version</version>
- <dependencies/>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>@version</version>
+ </dependency>
+ </dependencies>
</project>