Author: tucu Date: Thu Feb 9 20:42:39 2012 New Revision: 1242515 URL: http://svn.apache.org/viewvc?rev=1242515&view=rev Log: Merge -r 1242504:1242505 from trunk to branch. FIXES: HADOOP-8035
Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml hadoop/common/branches/branch-0.23/pom.xml 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=1242515&r1=1242514&r2=1242515&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Thu Feb 9 20:42:39 2012 @@ -778,25 +778,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-testdirs</id> - <phase>validate</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <mkdir dir="${test.build.dir}"/> - <mkdir dir="${test.build.data}"/> - </target> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <forkMode>always</forkMode> @@ -944,5 +925,53 @@ </plugins> </build> </profile> + <profile> + <id>dist</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <!-- build javadoc jars per jar for publishing to maven --> + <id>module-javadocs</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <!-- builds source jars and attaches them to the project for publishing --> + <id>hadoop-java-sources</id> + <phase>package</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>dist-enforce</id> + <phase>package</phase> + <goals> + <goal>enforce</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1242515&r1=1242514&r2=1242515&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml (original) +++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-tools-dist/pom.xml Thu Feb 9 20:42:39 2012 @@ -29,7 +29,6 @@ <properties> <hadoop.component>tools</hadoop.component> - <is.hadoop.component>false</is.hadoop.component> </properties> <dependencies> Modified: hadoop/common/branches/branch-0.23/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1242515&r1=1242514&r2=1242515&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/pom.xml (original) +++ hadoop/common/branches/branch-0.23/pom.xml Thu Feb 9 20:42:39 2012 @@ -90,6 +90,16 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>1.0</version> + <configuration> + <rules> + <requireMavenVersion> + <version>[3.0.2,)</version> + </requireMavenVersion> + <requireJavaVersion> + <version>1.6</version> + </requireJavaVersion> + </rules> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -126,16 +136,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <inherited>false</inherited> - <configuration> - <rules> - <requireMavenVersion> - <version>[3.0.2,)</version> - </requireMavenVersion> - <requireJavaVersion> - <version>1.6</version> - </requireJavaVersion> - </rules> - </configuration> <executions> <execution> <id>clean</id> @@ -195,6 +195,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.8.1</version> + <inherited>false</inherited> <reportSets> <reportSet> <id>aggregate</id> @@ -263,6 +264,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> <id>src-dist</id> @@ -287,6 +289,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> <id>src-dist-msg</id> @@ -316,54 +319,20 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> - <!-- build javadoc jars per jar for publishing to maven --> - <id>module-javadocs</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - <execution> <!-- build aggregate javadoc in parent only --> <id>default-cli</id> <goals> <goal>aggregate</goal> </goals> - <inherited>false</inherited> <configuration> <overview>hadoop-common-project/hadoop-common/src/main/java/overview.html</overview> </configuration> </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <!-- builds source jars and attaches them to the project for publishing --> - <id>hadoop-java-sources</id> - <phase>package</phase> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>enforce</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile>