Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190643 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2011-10-28 22:36:55 +00:00
parent 89d8dedfbe
commit 0eba9bcc06
26 changed files with 400 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILDING.txt
View File

@ -49,6 +49,7 @@ Maven build goals:
* Run Rat : mvn apache-rat:check * Run Rat : mvn apache-rat:check
* Build javadocs : mvn javadoc:javadoc * Build javadocs : mvn javadoc:javadoc
* Build distribution : mvn package [-Pdist][-Pdocs][-Psrc][-Pnative][-Dtar] * Build distribution : mvn package [-Pdist][-Pdocs][-Psrc][-Pnative][-Dtar]
* Change Hadoop version : mvn versions:set -DnewVersion=NEWVERSION
Build options: Build options:

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -1806,6 +1806,8 @@ Release 0.23.0 - Unreleased
MAPREDUCE-3183. hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml MAPREDUCE-3183. hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
missing license header. (Hitesh Shah via tucu). missing license header. (Hitesh Shah via tucu).
MAPREDUCE-3003. Publish MR JARs to Maven snapshot repository. (tucu)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-mapreduce-client</artifactId> <artifactId>hadoop-mapreduce-client</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-app</artifactId> <artifactId>hadoop-mapreduce-client-app</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-mapreduce-client-app</name> <name>hadoop-mapreduce-client-app</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<applink.base>${project.build.directory}/${project.name}</applink.base> <applink.base>${project.build.directory}/${project.name}</applink.base>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir> <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-mapreduce-client</artifactId> <artifactId>hadoop-mapreduce-client</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId> <artifactId>hadoop-mapreduce-client-common</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-mapreduce-client-common</name> <name>hadoop-mapreduce-client-common</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir> <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-mapreduce-client</artifactId> <artifactId>hadoop-mapreduce-client</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId> <artifactId>hadoop-mapreduce-client-core</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-mapreduce-client-core</name> <name>hadoop-mapreduce-client-core</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir> <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-mapreduce-client</artifactId> <artifactId>hadoop-mapreduce-client</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-hs</artifactId> <artifactId>hadoop-mapreduce-client-hs</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-mapreduce-client-hs</name> <name>hadoop-mapreduce-client-hs</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir> <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-mapreduce-client</artifactId> <artifactId>hadoop-mapreduce-client</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-jobclient</artifactId> <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-mapreduce-client-jobclient</name> <name>hadoop-mapreduce-client-jobclient</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<fork.mode>always</fork.mode> <fork.mode>always</fork.mode>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir> <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-mapreduce-client</artifactId> <artifactId>hadoop-mapreduce-client</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-shuffle</artifactId> <artifactId>hadoop-mapreduce-client-shuffle</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-mapreduce-client-shuffle</name> <name>hadoop-mapreduce-client-shuffle</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<mr.basedir>${project.parent.parent.basedir}</mr.basedir> <mr.basedir>${project.parent.parent.basedir}</mr.basedir>
</properties> </properties>

163
hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
View File

@ -16,11 +16,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce</artifactId> <artifactId>hadoop-project</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent> </parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client</artifactId> <artifactId>hadoop-mapreduce-client</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-mapreduce-client</name> <name>hadoop-mapreduce-client</name>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -35,18 +37,18 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn</artifactId> <artifactId>hadoop-yarn</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId> <artifactId>hadoop-yarn-api</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server</artifactId> <artifactId>hadoop-yarn-server</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
<type>pom</type> <type>pom</type>
</dependency> </dependency>
<dependency> <dependency>
@ -57,82 +59,205 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-common</artifactId> <artifactId>hadoop-yarn-server-common</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- end MNG-4223 workaround --> <!-- end MNG-4223 workaround -->
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<!-- mr security depends on hdfs --> <!-- mr security depends on hdfs -->
<artifactId>hadoop-hdfs</artifactId> <artifactId>hadoop-hdfs</artifactId>
<version>${hadoop-hdfs.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId> <artifactId>hadoop-yarn-common</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId> <artifactId>hadoop-yarn-common</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId> <artifactId>hadoop-yarn-server-tests</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-nodemanager</artifactId> <artifactId>hadoop-yarn-server-nodemanager</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId> <artifactId>hadoop-mapreduce-client-core</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-common</artifactId> <artifactId>hadoop-mapreduce-client-common</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-app</artifactId> <artifactId>hadoop-mapreduce-client-app</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-app</artifactId> <artifactId>hadoop-mapreduce-client-app</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-hs</artifactId> <artifactId>hadoop-mapreduce-client-hs</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-shuffle</artifactId> <artifactId>hadoop-mapreduce-client-shuffle</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.4.0a</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.5.3</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<artifactId>paranamer-ant</artifactId>
<groupId>com.thoughtworks.paranamer</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
</exclusion>
<exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-jetty</artifactId>
</exclusion>
<exclusion>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<!-- needed for security and runtime -->
<artifactId>hadoop-hdfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
<version>3.2.3.Final</version>
</dependency>
<dependency>
<groupId>com.cenqua.clover</groupId>
<artifactId>clover</artifactId>
<version>3.0.2</version>
</dependency>
</dependencies>
<modules> <modules>
<module>hadoop-mapreduce-client-core</module> <module>hadoop-mapreduce-client-core</module>
<module>hadoop-mapreduce-client-common</module> <module>hadoop-mapreduce-client-common</module>

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-api/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-yarn</artifactId> <artifactId>hadoop-yarn</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId> <artifactId>hadoop-yarn-api</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-api</name> <name>hadoop-yarn-api</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<yarn.basedir>${project.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.basedir}</yarn.basedir>
</properties> </properties>

16
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-yarn-applications</artifactId> <artifactId>hadoop-yarn-applications</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-applications-distributedshell</artifactId> <artifactId>hadoop-yarn-applications-distributedshell</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-applications-distributedshell</name> <name>hadoop-yarn-applications-distributedshell</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties> </properties>
@ -32,37 +32,37 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId> <artifactId>hadoop-yarn-api</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId> <artifactId>hadoop-yarn-common</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-nodemanager</artifactId> <artifactId>hadoop-yarn-server-nodemanager</artifactId>
<scope>test</scope> <scope>test</scope>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
<scope>test</scope> <scope>test</scope>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-common</artifactId> <artifactId>hadoop-yarn-server-common</artifactId>
<scope>test</scope> <scope>test</scope>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId> <artifactId>hadoop-yarn-server-tests</artifactId>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

3
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-applications/pom.xml
View File

@ -16,11 +16,12 @@
<parent> <parent>
<artifactId>hadoop-yarn</artifactId> <artifactId>hadoop-yarn</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-applications</artifactId> <artifactId>hadoop-yarn-applications</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-applications</name> <name>hadoop-yarn-applications</name>
<packaging>pom</packaging> <packaging>pom</packaging>

6
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-yarn</artifactId> <artifactId>hadoop-yarn</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId> <artifactId>hadoop-yarn-common</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-common</name> <name>hadoop-yarn-common</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<yarn.basedir>${project.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.basedir}</yarn.basedir>
</properties> </properties>
@ -109,7 +109,7 @@
<configuration> <configuration>
<executable>scripts/saveVersion.sh</executable> <executable>scripts/saveVersion.sh</executable>
<arguments> <arguments>
<argument>${yarn.version}</argument> <argument>${project.version}</argument>
<argument>${project.build.directory}</argument> <argument>${project.build.directory}</argument>
</arguments> </arguments>
</configuration> </configuration>

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-yarn-server</artifactId> <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-common</artifactId> <artifactId>hadoop-yarn-server-common</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-server-common</name> <name>hadoop-yarn-server-common</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-yarn-server</artifactId> <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-nodemanager</artifactId> <artifactId>hadoop-yarn-server-nodemanager</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-server-nodemanager</name> <name>hadoop-yarn-server-nodemanager</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
<container-executor.conf.dir>/etc/hadoop</container-executor.conf.dir> <container-executor.conf.dir>/etc/hadoop</container-executor.conf.dir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-yarn-server</artifactId> <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-server-resourcemanager</name> <name>hadoop-yarn-server-resourcemanager</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<fork.mode>always</fork.mode> <fork.mode>always</fork.mode>
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties> </properties>

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/pom.xml
View File

@ -16,14 +16,14 @@
<parent> <parent>
<artifactId>hadoop-yarn-server</artifactId> <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-tests</artifactId> <artifactId>hadoop-yarn-server-tests</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-server-tests</name> <name>hadoop-yarn-server-tests</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties> </properties>

2
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/pom.xml
View File

@ -16,7 +16,7 @@
<parent> <parent>
<artifactId>hadoop-yarn-server</artifactId> <artifactId>hadoop-yarn-server</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>

3
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/pom.xml
View File

@ -16,11 +16,12 @@
<parent> <parent>
<artifactId>hadoop-yarn</artifactId> <artifactId>hadoop-yarn</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server</artifactId> <artifactId>hadoop-yarn-server</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-server</name> <name>hadoop-yarn-server</name>
<packaging>pom</packaging> <packaging>pom</packaging>

4
hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/pom.xml
View File

@ -16,15 +16,15 @@
<parent> <parent>
<artifactId>hadoop-yarn</artifactId> <artifactId>hadoop-yarn</artifactId>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-site</artifactId> <artifactId>hadoop-yarn-site</artifactId>
<version>0.23.0-SNAPSHOT</version>
<name>hadoop-yarn-site</name> <name>hadoop-yarn-site</name>
<properties> <properties>
<install.file>${project.artifact.file}</install.file>
<yarn.basedir>${project.parent.parent.basedir}</yarn.basedir> <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir>
</properties> </properties>

247
hadoop-mapreduce-project/hadoop-yarn/pom.xml
View File

@ -14,9 +14,15 @@
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
<version>0.23.0-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn</artifactId> <artifactId>hadoop-yarn</artifactId>
<version>${yarn.version}</version> <version>0.23.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>hadoop-yarn</name> <name>hadoop-yarn</name>
<url>http://hadoop.apache.org/mapreduce</url> <url>http://hadoop.apache.org/mapreduce</url>
@ -25,12 +31,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<test.logs>true</test.logs> <test.logs>true</test.logs>
<test.timeout>600000</test.timeout> <test.timeout>600000</test.timeout>
<hadoop.assemblies.version>${project.version}</hadoop.assemblies.version>
<hadoop-common.version>0.23.0-SNAPSHOT</hadoop-common.version>
<hadoop-hdfs.version>0.23.0-SNAPSHOT</hadoop-hdfs.version>
<yarn.version>0.23.0-SNAPSHOT</yarn.version>
<install.pom>${project.build.directory}/saner-pom.xml</install.pom>
<install.file>${install.pom}</install.file>
<fork.mode>once</fork.mode> <fork.mode>once</fork.mode>
<yarn.basedir>${basedir}</yarn.basedir> <yarn.basedir>${basedir}</yarn.basedir>
</properties> </properties>
@ -54,7 +54,140 @@
</repository> </repository>
</repositories> </repositories>
<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>Apache Development Snapshot Repository</name>
<url>https://repository.apache.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<dependencies> <dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.4.0a</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>1.5.3</version>
<exclusions>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<artifactId>paranamer-ant</artifactId>
<groupId>com.thoughtworks.paranamer</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
</exclusion>
<exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
</exclusion>
<exclusion>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-jetty</artifactId>
</exclusion>
<exclusion>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.8.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<!-- needed for security and runtime -->
<artifactId>hadoop-hdfs</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
<version>3.2.3.Final</version>
</dependency>
<dependency>
<groupId>com.cenqua.clover</groupId>
<artifactId>clover</artifactId>
<version>3.0.2</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
@ -94,7 +227,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop-common.version}</version> <version>${project.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
@ -125,7 +258,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId> <artifactId>hadoop-annotations</artifactId>
<version>${hadoop-common.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
@ -147,14 +280,14 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop-common.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId> <artifactId>hadoop-hdfs</artifactId>
<version>${hadoop-hdfs.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -189,23 +322,23 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-api</artifactId> <artifactId>hadoop-yarn-api</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId> <artifactId>hadoop-yarn-common</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId> <artifactId>hadoop-yarn-common</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-common</artifactId> <artifactId>hadoop-yarn-server-common</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -215,12 +348,12 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-nodemanager</artifactId> <artifactId>hadoop-yarn-server-nodemanager</artifactId>
<version>${yarn.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
@ -329,86 +462,6 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-assemblies</artifactId>
<version>${hadoop.assemblies.version}</version>
</dependency>
</dependencies>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<finalName>${project.artifactId}-${project.version}</finalName>
<descriptorRefs>
<descriptorRef>hadoop-mapreduce-dist</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<id>tar</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>santize-pom</id>
<phase>package</phase>
<configuration>
<target>
<echo message="project.build.directory: ${project.build.directory}"/>
<copy file="pom.xml" tofile="${install.pom}">
<filterchain>
<!-- we'll have to wait for ant 1.8.3 for the following
<expandproperties>
<propertyset regex=".*version$">
</propertyset>
</expandproperties>
until then an even uglier workaround: -->
<tokenfilter>
<replaceregex pattern="\$\{hadoop-common.version}"
replace="${hadoop-common.version}" flags="g"/>
<replaceregex pattern="\$\{hadoop-hdfs.version}"
replace="${hadoop-hdfs.version}" flags="g"/>
<replaceregex pattern="\$\{yarn.version}"
replace="${yarn.version}" flags="g"/>
</tokenfilter>
</filterchain>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>install-sanitized-pom</id>
<configuration>
<file>${install.file}</file>
<pomFile>${install.pom}</pomFile>
</configuration>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>

1
hadoop-mapreduce-project/ivy.xml
View File

@ -148,6 +148,7 @@
<exclude org="javax.jms"/> <exclude org="javax.jms"/>
<exclude org="javax.mail"/> <exclude org="javax.mail"/>
<exclude org="org.apache.hadoop" module="avro"/> <exclude org="org.apache.hadoop" module="avro"/>
<exclude org="org.apache.commons" module="commons-daemon"/>
</dependencies> </dependencies>

96
hadoop-mapreduce-project/pom.xml
View File

@ -15,9 +15,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
<version>0.23.0-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce</artifactId> <artifactId>hadoop-mapreduce</artifactId>
<version>${hadoop-mapreduce.version}</version> <version>0.23.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>hadoop-mapreduce</name> <name>hadoop-mapreduce</name>
<url>http://hadoop.apache.org/mapreduce/</url> <url>http://hadoop.apache.org/mapreduce/</url>
@ -26,35 +32,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<test.logs>true</test.logs> <test.logs>true</test.logs>
<test.timeout>600000</test.timeout> <test.timeout>600000</test.timeout>
<hadoop.assemblies.version>${project.version}</hadoop.assemblies.version>
<hadoop-common.version>0.23.0-SNAPSHOT</hadoop-common.version>
<hadoop-hdfs.version>0.23.0-SNAPSHOT</hadoop-hdfs.version>
<hadoop-mapreduce.version>0.23.0-SNAPSHOT</hadoop-mapreduce.version>
<yarn.version>0.23.0-SNAPSHOT</yarn.version>
<install.pom>${project.build.directory}/saner-pom.xml</install.pom>
<install.file>${install.pom}</install.file>
<fork.mode>once</fork.mode> <fork.mode>once</fork.mode>
<mr.basedir>${basedir}</mr.basedir> <mr.basedir>${basedir}</mr.basedir>
</properties> </properties>
<repositories> <modules>
<repository> <module>hadoop-yarn</module>
<id>repository.jboss.org</id> <module>hadoop-mapreduce-client</module>
<url>http://repository.jboss.org/nexus/content/groups/public/</url> </modules>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>apache.snapshots</id>
<url>http://repository.apache.org/snapshots</url>
<!-- until we move to hadoop-common/hdfs trunk and/or maven 3 -->
<!-- cf. MNG-4326 -->
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
@ -96,7 +81,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop-common.version}</version> <version>${project.version}</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@ -135,7 +120,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId> <artifactId>hadoop-annotations</artifactId>
<version>${hadoop-common.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
@ -146,7 +131,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId> <artifactId>hadoop-common</artifactId>
<version>${hadoop-common.version}</version> <version>${project.version}</version>
<type>test-jar</type> <type>test-jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -154,7 +139,7 @@
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<!-- needed for security and runtime --> <!-- needed for security and runtime -->
<artifactId>hadoop-hdfs</artifactId> <artifactId>hadoop-hdfs</artifactId>
<version>${hadoop-hdfs.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.inject.extensions</groupId> <groupId>com.google.inject.extensions</groupId>
@ -276,37 +261,6 @@
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution>
<id>santize-pom</id>
<phase>package</phase>
<configuration>
<target>
<copy file="pom.xml" tofile="${install.pom}">
<filterchain>
<!-- we'll have to wait for ant 1.8.3 for the following
<expandproperties>
<propertyset regex=".*version$">
</propertyset>
</expandproperties>
until then an even uglier workaround: -->
<tokenfilter>
<replaceregex pattern="\$\{hadoop-common.version}"
replace="${hadoop-common.version}" flags="g"/>
<replaceregex pattern="\$\{hadoop-hdfs.version}"
replace="${hadoop-hdfs.version}" flags="g"/>
<replaceregex pattern="\$\{hadoop-mapreduce.version}"
replace="${hadoop-mapreduce.version}" flags="g"/>
<replaceregex pattern="\$\{yarn.version}"
replace="${yarn.version}" flags="g"/>
</tokenfilter>
</filterchain>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution> <execution>
<id>tar</id> <id>tar</id>
<phase>package</phase> <phase>package</phase>
@ -336,22 +290,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>install-sanitized-pom</id>
<configuration>
<file>${install.file}</file>
<pomFile>${install.pom}</pomFile>
</configuration>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>com.atlassian.maven.plugins</groupId> <groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId> <artifactId>maven-clover2-plugin</artifactId>
@ -447,10 +385,6 @@
</profile> </profile>
</profiles> </profiles>
<modules>
<module>hadoop-yarn</module>
<module>hadoop-mapreduce-client</module>
</modules>
<reporting> <reporting>
<plugins> <plugins>

2
hadoop-project-dist/pom.xml
View File

@ -400,7 +400,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-assemblies</artifactId> <artifactId>hadoop-assemblies</artifactId>
<version>${hadoop.assemblies.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>

62
hadoop-project/pom.xml
View File

@ -14,6 +14,11 @@
--> -->
<project> <project>
<modelVersion>4.0.0</modelVersion> <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> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId> <artifactId>hadoop-project</artifactId>
<version>0.23.0-SNAPSHOT</version> <version>0.23.0-SNAPSHOT</version>
@ -21,39 +26,6 @@
<name>Apache Hadoop Project POM</name> <name>Apache Hadoop Project POM</name>
<packaging>pom</packaging> <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> <properties>
<failIfNoTests>false</failIfNoTests> <failIfNoTests>false</failIfNoTests>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@ -65,16 +37,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- These 2 versions are defined here becuase they are used in the *-docs --> <!-- These 2 versions are defined here becuase they are used -->
<!-- module(s) for JDIFF generation from embedded ant in the antrun plugin --> <!-- JDIFF generation from embedded ant in the antrun plugin -->
<hadoop.annotations.version>${project.version}</hadoop.annotations.version> <hadoop.annotations.version>${project.version}</hadoop.annotations.version>
<jdiff.version>1.0.9</jdiff.version> <jdiff.version>1.0.9</jdiff.version>
<hadoop.assemblies.version>${project.version}</hadoop.assemblies.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> <commons-daemon.version>1.0.3</commons-daemon.version>
</properties> </properties>
@ -88,7 +57,7 @@
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-assemblies</artifactId> <artifactId>hadoop-assemblies</artifactId>
<version>${hadoop.assemblies.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.hadoop</groupId> <groupId>org.apache.hadoop</groupId>
@ -412,11 +381,6 @@
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.0</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -477,11 +441,6 @@
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.7</version>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>native-maven-plugin</artifactId> <artifactId>native-maven-plugin</artifactId>
@ -497,11 +456,6 @@
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version> <version>2.1.2</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.avro</groupId> <groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId> <artifactId>avro-maven-plugin</artifactId>

44
pom.xml
View File

@ -21,6 +21,34 @@
<name>Apache Hadoop Main</name> <name>Apache Hadoop Main</name>
<packaging>pom</packaging> <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> <licenses>
<license> <license>
<name>The Apache Software License, Version 2.0</name> <name>The Apache Software License, Version 2.0</name>
@ -33,6 +61,11 @@
<url>http://www.apache.org</url> <url>http://www.apache.org</url>
</organization> </organization>
<properties>
<distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
</properties>
<modules> <modules>
<module>hadoop-project</module> <module>hadoop-project</module>
<module>hadoop-project-dist</module> <module>hadoop-project-dist</module>
@ -52,11 +85,6 @@
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
<version>1.0</version> <version>1.0</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-3</version>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
@ -114,12 +142,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.rat</groupId> <groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId> <artifactId>apache-rat-plugin</artifactId>