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 tu...@apache.org on 2011/10/29 00:36:56 UTC
svn commit: r1190643 - in /hadoop/common/branches/branch-0.23: BUILDING.txt
hadoop-project-dist/pom.xml hadoop-project/pom.xml pom.xml
Author: tucu
Date: Fri Oct 28 22:36:55 2011
New Revision: 1190643
URL: http://svn.apache.org/viewvc?rev=1190643&view=rev
Log:
Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003
Modified:
hadoop/common/branches/branch-0.23/BUILDING.txt
hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
hadoop/common/branches/branch-0.23/pom.xml
Modified: hadoop/common/branches/branch-0.23/BUILDING.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/BUILDING.txt?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/BUILDING.txt (original)
+++ hadoop/common/branches/branch-0.23/BUILDING.txt Fri Oct 28 22:36:55 2011
@@ -49,6 +49,7 @@ Maven build goals:
* Run Rat : mvn apache-rat:check
* Build javadocs : mvn javadoc:javadoc
* Build distribution : mvn package [-Pdist][-Pdocs][-Psrc][-Pnative][-Dtar]
+ * Change Hadoop version : mvn versions:set -DnewVersion=NEWVERSION
Build options:
Modified: hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml Fri Oct 28 22:36:55 2011
@@ -400,7 +400,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-assemblies</artifactId>
- <version>${hadoop.assemblies.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<executions>
Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Fri Oct 28 22:36:55 2011
@@ -14,6 +14,11 @@
-->
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-main</artifactId>
+ <version>0.23.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
<version>0.23.0-SNAPSHOT</version>
@@ -21,39 +26,6 @@
<name>Apache Hadoop Project POM</name>
<packaging>pom</packaging>
- <distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
- <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- </snapshotRepository>
- </distributionManagement>
-
- <repositories>
- <repository>
- <id>apache.snapshots.https</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- </repository>
- </repositories>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <organization>
- <name>Apache Software Foundation</name>
- <url>http://www.apache.org</url>
- </organization>
-
<properties>
<failIfNoTests>false</failIfNoTests>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -65,16 +37,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <!-- These 2 versions are defined here becuase they are used in the *-docs -->
- <!-- module(s) for JDIFF generation from embedded ant in the antrun plugin -->
+ <!-- These 2 versions are defined here becuase they are used -->
+ <!-- JDIFF generation from embedded ant in the antrun plugin -->
<hadoop.annotations.version>${project.version}</hadoop.annotations.version>
<jdiff.version>1.0.9</jdiff.version>
<hadoop.assemblies.version>${project.version}</hadoop.assemblies.version>
- <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
- <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
-
<commons-daemon.version>1.0.3</commons-daemon.version>
</properties>
@@ -88,7 +57,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-assemblies</artifactId>
- <version>${hadoop.assemblies.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -414,11 +383,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
</plugin>
@@ -478,11 +442,6 @@
<version>2.6</version>
</plugin>
<plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>1.0-alpha-7</version>
@@ -498,11 +457,6 @@
<version>2.1.2</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
<version>1.5.3</version>
Modified: hadoop/common/branches/branch-0.23/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Fri Oct 28 22:36:55 2011
@@ -21,6 +21,34 @@
<name>Apache Hadoop Main</name>
<packaging>pom</packaging>
+ <distributionManagement>
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots.https</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </repository>
+ <repository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -33,6 +61,11 @@
<url>http://www.apache.org</url>
</organization>
+ <properties>
+ <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+ <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+ </properties>
+
<modules>
<module>hadoop-project</module>
<module>hadoop-project-dist</module>
@@ -54,11 +87,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
</plugin>
@@ -115,12 +143,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>