Author: todd
Date: Wed Jan 23 18:51:24 2013
New Revision: 1437623
URL: http://svn.apache.org/viewvc?rev=1437623&view=rev
Log:
Merge trunk into branch
Added:
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/
- copied from r1437619, hadoop/common/trunk/hadoop-maven-plugins/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/pom.xml
- copied unchanged from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/pom.xml
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/
- copied from r1437619, hadoop/common/trunk/hadoop-maven-plugins/src/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/
- copied from r1437619, hadoop/common/trunk/hadoop-maven-plugins/src/main/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
- copied unchanged from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
- copied unchanged from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/
- copied from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/
hadoop/common/branches/HDFS-347/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
- copied unchanged from r1437619,
hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
Modified:
hadoop/common/branches/HDFS-347/ (props changed)
hadoop/common/branches/HDFS-347/hadoop-project/pom.xml
hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/HDFS-347/pom.xml
Propchange: hadoop/common/branches/HDFS-347/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1433249-1437619
Modified: hadoop/common/branches/HDFS-347/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-project/pom.xml?rev=1437623&r1=1437622&r2=1437623&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-347/hadoop-project/pom.xml Wed Jan 23 18:51:24
2013
@@ -769,6 +769,11 @@
<artifactId>maven-pdf-plugin</artifactId>
<version>1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-maven-plugins</artifactId>
+ <version>${project.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
Modified: hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/pom.xml?rev=1437623&r1=1437622&r2=1437623&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/pom.xml (original)
+++ hadoop/common/branches/HDFS-347/hadoop-tools/hadoop-pipes/pom.xml Wed Jan
23 18:51:24 2013
@@ -57,6 +57,9 @@
<exec executable="make"
dir="${project.build.directory}/native" failonerror="true">
<arg line="VERBOSE=1"/>
</exec>
+ <!-- The second make is a workaround for HADOOP-9215. It
can
+ be removed when version 2.6 of cmake is no longer
supported . -->
+ <exec executable="make"
dir="${project.build.directory}/native" failonerror="true"></exec>
</target>
</configuration>
</execution>
Modified: hadoop/common/branches/HDFS-347/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-347/pom.xml?rev=1437623&r1=1437622&r2=1437623&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-347/pom.xml (original)
+++ hadoop/common/branches/HDFS-347/pom.xml Wed Jan 23 18:51:24 2013
@@ -36,12 +36,12 @@ xsi:schemaLocation="http://maven.apache.
<distributionManagement>
<repository>
- <id>apache.staging.https</id>
- <name>Apache Release Distribution Repository</name>
-
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ <id>${distMgmtStagingId}</id>
+ <name>${distMgmtStagingName}</name>
+ <url>${distMgmtStagingUrl}</url>
</repository>
<snapshotRepository>
- <id>apache.snapshots.https</id>
+ <id>${distMgmtSnapshotsId}</id>
<name>${distMgmtSnapshotsName}</name>
<url>${distMgmtSnapshotsUrl}</url>
</snapshotRepository>
@@ -53,7 +53,7 @@ xsi:schemaLocation="http://maven.apache.
<repositories>
<repository>
- <id>apache.snapshots.https</id>
+ <id>${distMgmtSnapshotsId}</id>
<name>${distMgmtSnapshotsName}</name>
<url>${distMgmtSnapshotsUrl}</url>
</repository>
@@ -79,14 +79,19 @@ xsi:schemaLocation="http://maven.apache.
</organization>
<properties>
+ <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
<distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+ <distMgmtStagingId>apache.staging.https</distMgmtStagingId>
+ <distMgmtStagingName>Apache Release Distribution
Repository</distMgmtStagingName>
+
<distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
</properties>
<modules>
<module>hadoop-project</module>
<module>hadoop-project-dist</module>
<module>hadoop-assemblies</module>
+ <module>hadoop-maven-plugins</module>
<module>hadoop-common-project</module>
<module>hadoop-hdfs-project</module>
<module>hadoop-yarn-project</module>
