Author: atm
Date: Wed Nov 2 05:34:31 2011
New Revision: 1196458
URL: http://svn.apache.org/viewvc?rev=1196458&view=rev
Log:
Merge trunk into HA branch
Added:
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
- copied unchanged from r1196451,
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
hadoop/common/branches/HDFS-1623/hadoop-dist/ (props changed)
- copied from r1196451, hadoop/common/trunk/hadoop-dist/
hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml
- copied unchanged from r1196451, hadoop/common/trunk/hadoop-dist/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-project/src/
- copied from r1196451, hadoop/common/trunk/hadoop-project/src/
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/
- copied from r1196451, hadoop/common/trunk/hadoop-project/src/site/
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/apt/
- copied from r1196451, hadoop/common/trunk/hadoop-project/src/site/apt/
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/apt/index.apt.vm
- copied unchanged from r1196451,
hadoop/common/trunk/hadoop-project/src/site/apt/index.apt.vm
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/resources/
- copied from r1196451,
hadoop/common/trunk/hadoop-project/src/site/resources/
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/resources/css/
- copied from r1196451,
hadoop/common/trunk/hadoop-project/src/site/resources/css/
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/resources/css/site.css
- copied unchanged from r1196451,
hadoop/common/trunk/hadoop-project/src/site/resources/css/site.css
hadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml
- copied unchanged from r1196451,
hadoop/common/trunk/hadoop-project/src/site/site.xml
hadoop/common/branches/HDFS-1623/hadoop-tools/ (props changed)
- copied from r1196451, hadoop/common/trunk/hadoop-tools/
hadoop/common/branches/HDFS-1623/hadoop-tools/pom.xml
- copied unchanged from r1196451, hadoop/common/trunk/hadoop-tools/pom.xml
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/.gitignore
hadoop/common/branches/HDFS-1623/BUILDING.txt
hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml
hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml
hadoop/common/branches/HDFS-1623/pom.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 2 05:34:31 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1179483
+/hadoop/common/trunk:1152502-1196451
Modified: hadoop/common/branches/HDFS-1623/.gitignore
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/.gitignore?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/.gitignore (original)
+++ hadoop/common/branches/HDFS-1623/.gitignore Wed Nov 2 05:34:31 2011
@@ -7,3 +7,4 @@
.project
.settings
target
+hadoop-hdfs-project/hadoop-hdfs/downloads
Modified: hadoop/common/branches/HDFS-1623/BUILDING.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/BUILDING.txt?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/BUILDING.txt (original)
+++ hadoop/common/branches/HDFS-1623/BUILDING.txt Wed Nov 2 05:34:31 2011
@@ -1,5 +1,4 @@
-
-Build instructions for Hadoop Common/HDFS using Maven
+Build instructions for Hadoop
----------------------------------------------------------------------------------
Requirements:
@@ -9,19 +8,24 @@ Requirements:
* Maven 3.0
* Forrest 0.8 (if generating docs)
* Findbugs 1.3.9 (if running findbugs)
+* ProtocolBuffer 2.4.1+ (for MapReduce)
* Autotools (if compiling native code)
* Internet connection for first build (to fetch all Maven and Hadoop
dependencies)
----------------------------------------------------------------------------------
-Maven modules:
+Maven main modules:
- hadoop (Main Hadoop project)
- - hadoop-project (Parent POM for all Hadoop Maven modules.
)
- (All plugins & dependencies versions are
defined here.)
- - hadoop-project-dist (Parent POM for modules that generate
distributions.)
- - hadoop-annotations (Generates the Hadoop doclet used to generated
the Javadocs)
- - hadoop-common (Hadoop Common)
- - hadoop-hdfs (Hadoop HDFS)
+ hadoop (Main Hadoop project)
+ - hadoop-project (Parent POM for all Hadoop Maven modules.
)
+ (All plugins & dependencies versions are
defined here.)
+ - hadoop-project-dist (Parent POM for modules that generate
distributions.)
+ - hadoop-annotations (Generates the Hadoop doclet used to
generated the Javadocs)
+ - hadoop-assemblies (Maven assemblies used by the different
modules)
+ - hadoop-common-project (Hadoop Common)
+ - hadoop-hdfs-project (Hadoop HDFS)
+ - hadoop-mapreduce-project (Hadoop MapReduce)
+ - hadoop-tools (Hadoop tools like Streaming, Distcp, etc.)
+ - hadoop-dist (Hadoop distribution assembler)
----------------------------------------------------------------------------------
Where to run Maven from?
@@ -45,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:
@@ -52,15 +57,34 @@ Maven build goals:
* Use -Dsnappy.prefix=(/usr/local) & -Dbundle.snappy=(false) to compile
Snappy JNI bindings and to bundle Snappy SO files
* Use -Pdocs to generate & bundle the documentation in the distribution
(using -Pdist)
- * Use -Psrc to bundle the source in the distribution (using -Pdist)
+ * Use -Psrc to create a project source TAR.GZ
* Use -Dtar to create a TAR with the distribution (using -Pdist)
Tests options:
* Use -DskipTests to skip tests when running the following Maven goals:
'package', 'install', 'deploy' or 'verify'
- * -Dtest=<TESTCLASSNAME>,....
+ * -Dtest=<TESTCLASSNAME>,<TESTCLASSNAME#METHODNAME>,....
* -Dtest.exclude=<TESTCLASSNAME>
* -Dtest.exclude.pattern=**/<TESTCLASSNAME1>.java,**/<TESTCLASSNAME2>.java
----------------------------------------------------------------------------------
+Building distributions:
+
+Create binary distribution without native code and without documentation:
+
+ $ mvn package -Pdist -DskipTests -Dtar
+
+Create binary distribution with native code and with documentation:
+
+ $ mvn package -Pdist,native,docs -DskipTests -Dtar
+
+Create source distribution:
+
+ $ mvn package -Psrc -DskipTests
+
+Create source and binary distributions with native code and documentation:
+
+ $ mvn package -Pdist,native,docs,src -DskipTests -Dtar
+
+----------------------------------------------------------------------------------
Modified: hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-1623/dev-support/test-patch.sh Wed Nov 2
05:34:31 2011
@@ -597,20 +597,23 @@ runTests () {
echo "======================================================================"
echo ""
echo ""
-
- echo "$MVN clean install test -Pnative -D${PROJECT_NAME}PatchProcess"
- $MVN clean install test -Pnative -D${PROJECT_NAME}PatchProcess
+
+ echo "$MVN clean install -Pnative -D${PROJECT_NAME}PatchProcess"
+ $MVN clean install -Pnative -D${PROJECT_NAME}PatchProcess
if [[ $? != 0 ]] ; then
### Find and format names of failed tests
failed_tests=`find . -name 'TEST*.xml' | xargs $GREP -l -E
"<failure|<error" | sed -e "s|.*target/surefire-reports/TEST-|
|g" | sed -e "s|\.xml||g"`
- fi
-
- if [[ -n "$failed_tests" ]] ; then
-
- JIRA_COMMENT="$JIRA_COMMENT
+
+ if [[ -n "$failed_tests" ]] ; then
+ JIRA_COMMENT="$JIRA_COMMENT
-1 core tests. The patch failed these unit tests:
$failed_tests"
+ else
+ JIRA_COMMENT="$JIRA_COMMENT
+
+ -1 core tests. The patch failed the unit tests build"
+ fi
return 1
fi
JIRA_COMMENT="$JIRA_COMMENT
Modified:
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml
Wed Nov 2 05:34:31 2011
@@ -107,10 +107,6 @@
<directory>${project.build.directory}/site</directory>
<outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
</fileSet>
- <fileSet>
- <directory>${project.build.directory}/src</directory>
- <outputDirectory>/share/hadoop/${hadoop.component}/src</outputDirectory>
- </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified:
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
(original)
+++
hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml
Wed Nov 2 05:34:31 2011
@@ -19,18 +19,29 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
<id>hadoop-src</id>
<formats>
- <format>dir</format>
+ <format>tar.gz</format>
</formats>
- <includeBaseDirectory>false</includeBaseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>src/</outputDirectory>
+ <directory>.</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
+ <exclude>.git/**</exclude>
+ <exclude>**/.gitignore</exclude>
+ <exclude>**/.svn</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/target/**</exclude>
+ <!-- until the code that does this is fixed -->
<exclude>**/*.log</exclude>
<exclude>**/build/**</exclude>
- <exclude>**/target/**</exclude>
+ <exclude>**/file:/**</exclude>
+ <exclude>**/SecurityAuth.audit*</exclude>
</excludes>
</fileSet>
</fileSets>
Propchange: hadoop/common/branches/HDFS-1623/hadoop-dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 2 05:34:31 2011
@@ -0,0 +1 @@
+target
Modified: hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project-dist/pom.xml Wed Nov 2
05:34:31 2011
@@ -318,45 +318,6 @@
</profile>
<profile>
- <id>src</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <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>
- <executions>
- <execution>
- <id>pre-tar-src</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <attach>false</attach>
-
<finalName>${project.artifactId}-${project.version}</finalName>
- <descriptorRefs>
- <descriptorRef>hadoop-src</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>dist</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -439,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/HDFS-1623/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Wed Nov 2 05:34:31
2011
@@ -14,6 +14,11 @@
-->
<project>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-main</artifactId>
+ <version>0.24.0-SNAPSHOT</version>
+ </parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
<version>0.24.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>
<test.build.dir>${project.build.directory}/test-dir</test.build.dir>
@@ -91,7 +60,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>
@@ -114,6 +83,21 @@
<artifactId>hadoop-auth</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-app</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -407,11 +391,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>
@@ -428,7 +407,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -471,11 +450,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>
@@ -491,11 +465,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>
@@ -508,7 +477,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1.1</version>
+ <version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -526,44 +495,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[3.0.0,)</version>
- </requireMavenVersion>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- <executions>
- <execution>
- <id>clean</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>pre-clean</phase>
- </execution>
- <execution>
- <id>default</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>validate</phase>
- </execution>
- <execution>
- <id>site</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>pre-site</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
Propchange: hadoop/common/branches/HDFS-1623/hadoop-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Nov 2 05:34:31 2011
@@ -0,0 +1 @@
+target
Modified: hadoop/common/branches/HDFS-1623/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/pom.xml?rev=1196458&r1=1196457&r2=1196458&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/pom.xml Wed Nov 2 05:34:31 2011
@@ -21,6 +21,38 @@
<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>
+ <site>
+ <id>apache.website</id>
+
<url>scpexe://people.apache.org/www/hadoop.apache.org/docs/r${project.version}</url>
+ </site>
+ </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 +65,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>
@@ -40,6 +77,8 @@
<module>hadoop-common-project</module>
<module>hadoop-hdfs-project</module>
<module>hadoop-mapreduce-project</module>
+ <module>hadoop-tools</module>
+ <module>hadoop-dist</module>
</modules>
<build>
@@ -52,11 +91,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>
@@ -65,6 +99,19 @@
<artifactId>apache-rat-plugin</artifactId>
<version>0.7</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <configuration>
+ <generateReports>true</generateReports>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
@@ -108,12 +155,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>
@@ -123,7 +164,140 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
+
+ <reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <configuration>
+ <maxmemory>1024m</maxmemory>
+ <linksource>true</linksource>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <source>${maven.compile.source}</source>
+ <charset>${maven.compile.encoding}</charset>
+
<reportOutputDirectory>${project.build.directory}/site</reportOutputDirectory>
+ <destDir>hadoop-project/api</destDir>
+ <!-- Non-public APIs -->
+
<excludePackageNames>org.apache.hadoop.authentication*,org.apache.hadoop.hdfs*,org.apache.hadoop.mapreduce.v2.proto,org.apache.hadoop.yarn.proto,org.apache.hadoop.yarn.server*,org.apache.hadoop.yarn.webapp*</excludePackageNames>
+ <groups>
+ <group>
+ <title>Common</title>
+ <packages>org.apache.hadoop*</packages>
+ </group>
+ <group>
+ <title>MapReduce</title>
+ <packages>org.apache.hadoop.mapred*</packages>
+ </group>
+ <group>
+ <title>YARN</title>
+ <packages>org.apache.hadoop.yarn*</packages>
+ </group>
+ </groups>
+
<doclet>org.apache.hadoop.classification.tools.IncludePublicAnnotationsStandardDoclet</doclet>
+ <docletArtifacts>
+ <docletArtifact>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${project.version}</version>
+ </docletArtifact>
+ </docletArtifacts>
+ <useStandardDocletOptions>true</useStandardDocletOptions>
+
+ <!-- switch on dependency-driven aggregation -->
+ <includeDependencySources>false</includeDependencySources>
+
+ <dependencySourceIncludes>
+ <!-- include ONLY dependencies I control -->
+
<dependencySourceInclude>org.apache.hadoop:hadoop-annotations</dependencySourceInclude>
+ </dependencySourceIncludes>
+
+ </configuration>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>src</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>src-dist</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <finalName>hadoop-dist-${project.version}-src</finalName>
+ <outputDirectory>hadoop-dist/target</outputDirectory>
+ <!-- Not using descriptorRef and hadoop-assembly dependency
-->
+ <!-- to avoid making hadoop-main to depend on a module
-->
+ <descriptors>
+
<descriptor>hadoop-assemblies/src/main/resources/assemblies/hadoop-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>src-dist-msg</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <echo/>
+ <echo>Hadoop source tar available at:
${basedir}/hadoop-dist/target/hadoop-dist-${project.version}-src.tar.gz</echo>
+ <echo/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
