Return-Path: 
 <common-commits-return-15818-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4044D7E22
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Fri, 28 Oct 2011 22:37:18 +0000 (UTC)
Received: (qmail 9437 invoked by uid 500); 28 Oct 2011 22:37:18 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 9406 invoked by uid 500); 28 Oct 2011 22:37:18 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 9399 invoked by uid 99); 28 Oct 2011 22:37:18 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 22:37:17 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 22:37:16 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 6F4C62388A9C
	for <common-commits@hadoop.apache.org>; Fri, 28 Oct 2011 22:36:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1190643 - in /hadoop/common/branches/branch-0.23:
 BUILDING.txt
 hadoop-project-dist/pom.xml hadoop-project/pom.xml pom.xml
Date: Fri, 28 Oct 2011 22:36:56 -0000
To: common-commits@hadoop.apache.org
From: tucu@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111028223656.6F4C62388A9C@eris.apache.org>

Author: tucu
Date: Fri Oct 28 22:36:55 2011
New Revision: 1190643

URL: http://svn.apache.org/viewvc?rev=1190643&view=rev
Log:
Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003

Modified:
    hadoop/common/branches/branch-0.23/BUILDING.txt
    hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml
    hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
    hadoop/common/branches/branch-0.23/pom.xml

Modified: hadoop/common/branches/branch-0.23/BUILDING.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/BUILDING.txt?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/BUILDING.txt (original)
+++ hadoop/common/branches/branch-0.23/BUILDING.txt Fri Oct 28 22:36:55 2011
@@ -49,6 +49,7 @@ Maven build goals:
  * Run Rat                   : mvn apache-rat:check
  * Build javadocs            : mvn javadoc:javadoc
  * Build distribution        : mvn package [-Pdist][-Pdocs][-Psrc][-Pnative][-Dtar]
+ * Change Hadoop version     : mvn versions:set -DnewVersion=NEWVERSION
 
  Build options:
 

Modified: hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project-dist/pom.xml Fri Oct 28 22:36:55 2011
@@ -400,7 +400,7 @@
               <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-assemblies</artifactId>
-                <version>${hadoop.assemblies.version}</version>
+                <version>${project.version}</version>
               </dependency>
             </dependencies>
             <executions>

Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Fri Oct 28 22:36:55 2011
@@ -14,6 +14,11 @@
 -->
 <project>
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-main</artifactId>
+    <version>0.23.0-SNAPSHOT</version>
+  </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-project</artifactId>
   <version>0.23.0-SNAPSHOT</version>
@@ -21,39 +26,6 @@
   <name>Apache Hadoop Project POM</name>
   <packaging>pom</packaging>
 
-  <distributionManagement>
-    <repository>
-      <id>apache.releases.https</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots.https</id>
-      <name>${distMgmtSnapshotsName}</name>
-      <url>${distMgmtSnapshotsUrl}</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <repositories>
-    <repository>
-      <id>apache.snapshots.https</id>
-      <name>${distMgmtSnapshotsName}</name>
-      <url>${distMgmtSnapshotsUrl}</url>
-    </repository>
-  </repositories>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
   <properties>
     <failIfNoTests>false</failIfNoTests>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -65,16 +37,13 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <!-- These 2 versions are defined here becuase they are used in the *-docs -->
-    <!-- module(s) for JDIFF generation from embedded ant in the antrun plugin -->
+    <!-- These 2 versions are defined here becuase they are used -->
+    <!-- JDIFF generation from embedded ant in the antrun plugin -->
     <hadoop.annotations.version>${project.version}</hadoop.annotations.version>
     <jdiff.version>1.0.9</jdiff.version>
 
     <hadoop.assemblies.version>${project.version}</hadoop.assemblies.version>
 
-    <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
-    <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
-
     <commons-daemon.version>1.0.3</commons-daemon.version>
   </properties>
 
@@ -88,7 +57,7 @@
       <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-assemblies</artifactId>
-        <version>${hadoop.assemblies.version}</version>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -414,11 +383,6 @@
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.3.2</version>
         </plugin>
@@ -478,11 +442,6 @@
           <version>2.6</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.7</version>
-        </plugin>
-        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>native-maven-plugin</artifactId>
           <version>1.0-alpha-7</version>
@@ -498,11 +457,6 @@
           <version>2.1.2</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
           <groupId>org.apache.avro</groupId>
           <artifactId>avro-maven-plugin</artifactId>
           <version>1.5.3</version>

Modified: hadoop/common/branches/branch-0.23/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1190643&r1=1190642&r2=1190643&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Fri Oct 28 22:36:55 2011
@@ -21,6 +21,34 @@
   <name>Apache Hadoop Main</name>
   <packaging>pom</packaging>
 
+  <distributionManagement>
+    <repository>
+      <id>apache.releases.https</id>
+      <name>Apache Release Distribution Repository</name>
+      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+    </repository>
+    <snapshotRepository>
+      <id>apache.snapshots.https</id>
+      <name>${distMgmtSnapshotsName}</name>
+      <url>${distMgmtSnapshotsUrl}</url>
+    </snapshotRepository>
+  </distributionManagement>
+
+  <repositories>
+    <repository>
+      <id>apache.snapshots.https</id>
+      <name>${distMgmtSnapshotsName}</name>
+      <url>${distMgmtSnapshotsUrl}</url>
+    </repository>
+    <repository>
+      <id>repository.jboss.org</id>
+      <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <licenses>
     <license>
       <name>The Apache Software License, Version 2.0</name>
@@ -33,6 +61,11 @@
     <url>http://www.apache.org</url>
   </organization>
 
+  <properties>
+    <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
+    <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+  </properties>
+
   <modules>
     <module>hadoop-project</module>
     <module>hadoop-project-dist</module>
@@ -54,11 +87,6 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.5</version>
         </plugin>
@@ -115,12 +143,6 @@
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>