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 sz...@apache.org on 2012/02/10 04:04:10 UTC
svn commit: r1242642 - in /hadoop/common/branches/branch-0.23-PB: ./
hadoop-assemblies/ hadoop-client/ hadoop-dist/ hadoop-minicluster/
hadoop-project-dist/ hadoop-project/ hadoop-project/src/site/ hadoop-tools/
hadoop-tools/hadoop-archives/ hadoop-too...
Author: szetszwo
Date: Fri Feb 10 03:04:05 2012
New Revision: 1242642
URL: http://svn.apache.org/viewvc?rev=1242642&view=rev
Log:
Merge r1241554 through r1242605 from 0.23.
Modified:
hadoop/common/branches/branch-0.23-PB/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-client/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-dist/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-project/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-project-dist/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/ (props changed)
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-archives/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-extras/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml
hadoop/common/branches/branch-0.23-PB/pom.xml
Propchange: hadoop/common/branches/branch-0.23-PB/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 03:04:05 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23:1227776-1241553
+/hadoop/common/branches/branch-0.23:1227776-1242605
/hadoop/common/trunk:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-assemblies/pom.xml Fri Feb 10 03:04:05 2012
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-assemblies</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<name>Apache Hadoop Assemblies</name>
<description>Apache Hadoop Assemblies</description>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-client/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-client/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-client/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-client/pom.xml Fri Feb 10 03:04:05 2012
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Apache Hadoop Client</description>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-dist/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-dist/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-dist</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Distribution</description>
<name>Apache Hadoop Distribution</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-minicluster/pom.xml Fri Feb 10 03:04:05 2012
@@ -18,12 +18,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<packaging>jar</packaging>
<description>Apache Hadoop Mini-Cluster</description>
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 03:04:05 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1241553
+/hadoop/common/branches/branch-0.23/hadoop-project:1227776-1242605
/hadoop/common/trunk/hadoop-project:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213598,1213954,1214046,1214499,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239386,1239752,1240897,1240928
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-project-dist/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-project-dist/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project-dist</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Project Dist POM</description>
<name>Apache Hadoop Project Dist POM</name>
<packaging>pom</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-project/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,11 +17,11 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-main</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Project POM</description>
<name>Apache Hadoop Project POM</name>
<packaging>pom</packaging>
@@ -773,25 +773,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>
@@ -939,5 +920,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>
Propchange: hadoop/common/branches/branch-0.23-PB/hadoop-project/src/site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 10 03:04:05 2012
@@ -1,2 +1,2 @@
-/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1241553
+/hadoop/common/branches/branch-0.23/hadoop-project/src/site:1227776-1242605
/hadoop/common/trunk/hadoop-project/src/site:1161777,1161781,1162188,1162421,1162491,1162499,1162613,1162928,1162954,1162979,1163050,1163069,1163490,1163768,1163852,1163858,1163981,1164255,1164301,1164339,1166009,1166402,1167001,1167383,1167662,1170085,1170379,1170459,1171297,1172916,1173402,1176550,1177487,1177531,1177859,1177864,1182189,1182205,1182214,1189613,1189932,1189982,1195575,1196113,1196129,1204114,1204117,1204122,1204124,1204129,1204131,1204177,1204370,1204376,1204388,1205260,1205626,1205697,1206786,1206830,1207694,1208153,1208313,1212021,1212062,1212073,1212084,1213537,1213586,1213592-1213593,1213954,1214046,1220510,1221348,1225114,1225192,1225456,1225489,1225591,1226211,1226239,1226350,1227091,1227165,1227423,1227964,1229347,1230398,1231569,1231572,1231627,1231640,1233605,1234555,1235135,1235137,1235956,1236456,1239752,1240897,1240928
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-archives/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-archives/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-archives/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-archives/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-archives</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Archives</description>
<name>Apache Hadoop Archives</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-distcp/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Distributed Copy</description>
<name>Apache Hadoop Distributed Copy</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-extras/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-extras/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-extras/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-extras/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-extras</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Extras</description>
<name>Apache Hadoop Extras</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-rumen</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Rumen</description>
<name>Apache Hadoop Rumen</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ZombieJob.java Fri Feb 10 03:04:05 2012
@@ -229,7 +229,7 @@ public class ZombieJob implements JobSto
@Override
public String getName() {
JobName jobName = job.getJobName();
- if (jobName == null) {
+ if (jobName == null || jobName.getValue() == null) {
return "(name unknown)";
} else {
return jobName.getValue();
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-streaming/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-streaming</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop MapReduce Streaming</description>
<name>Apache Hadoop MapReduce Streaming</name>
<packaging>jar</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/hadoop-tools-dist/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,19 +17,18 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project-dist</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../../hadoop-project-dist</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-tools-dist</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Tools Dist</description>
<name>Apache Hadoop Tools Dist</name>
<packaging>jar</packaging>
<properties>
<hadoop.component>tools</hadoop.component>
- <is.hadoop.component>false</is.hadoop.component>
</properties>
<dependencies>
Modified: hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/hadoop-tools/pom.xml Fri Feb 10 03:04:05 2012
@@ -17,12 +17,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<relativePath>../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-tools</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Tools</description>
<name>Apache Hadoop Tools</name>
<packaging>pom</packaging>
Modified: hadoop/common/branches/branch-0.23-PB/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23-PB/pom.xml?rev=1242642&r1=1242641&r2=1242642&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23-PB/pom.xml (original)
+++ hadoop/common/branches/branch-0.23-PB/pom.xml Fri Feb 10 03:04:05 2012
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-main</artifactId>
- <version>0.23.1-SNAPSHOT</version>
+ <version>0.23.2-SNAPSHOT</version>
<description>Apache Hadoop Main</description>
<name>Apache Hadoop Main</name>
<packaging>pom</packaging>
@@ -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>
@@ -110,6 +120,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.0</version>
+ <dependencies>
+ <dependency><!-- add support for ssh/scp -->
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</pluginManagement>
@@ -119,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>
@@ -188,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>
@@ -256,6 +264,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
<executions>
<execution>
<id>src-dist</id>
@@ -280,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>
@@ -309,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>