Return-Path: 
 <mapreduce-commits-return-1504-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 67460 invoked from network); 13 Apr 2011 19:42:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 13 Apr 2011 19:42:51 -0000
Received: (qmail 51664 invoked by uid 500); 13 Apr 2011 19:42:51 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 51629 invoked by uid 500); 13 Apr 2011 19:42:50 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 51621 invoked by uid 99); 13 Apr 2011 19:42:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Apr 2011 19:42:50 +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; Wed, 13 Apr 2011 19:42:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EA20023889D7; Wed, 13 Apr 2011 19:42:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1091896 - in /hadoop/mapreduce/branches/MR-279: ./
 assembly/
 ivy/ mr-client/ mr-client/hadoop-mapreduce-client-app/
 mr-client/hadoop-mapreduce-client-common/
 mr-client/hadoop-mapreduce-client-core/
 mr-client/hadoop-mapreduce-client-hs/ mr-...
Date: Wed, 13 Apr 2011 19:42:26 -0000
To: mapreduce-commits@hadoop.apache.org
From: mahadev@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110413194226.EA20023889D7@eris.apache.org>

Author: mahadev
Date: Wed Apr 13 19:42:25 2011
New Revision: 1091896

URL: http://svn.apache.org/viewvc?rev=1091896&view=rev
Log:
Install sanitized poms for downstream sanity (Luke Lu via mahadev)

Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    hadoop/mapreduce/branches/MR-279/assembly/all.xml
    hadoop/mapreduce/branches/MR-279/ivy.xml
    hadoop/mapreduce/branches/MR-279/ivy/libraries.properties
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/pom.xml
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/pom.xml
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-core/pom.xml
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/pom.xml
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/pom.xml
    hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-shuffle/pom.xml
    hadoop/mapreduce/branches/MR-279/mr-client/pom.xml
    hadoop/mapreduce/branches/MR-279/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/yarn-api/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/yarn-common/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/pom.xml
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-tests/pom.xml

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Wed Apr 13 19:42:25 2011
@@ -10,6 +10,8 @@ Trunk (unreleased changes)
     Add HistoryCleanerService to Job History server. (Krishna Ramachandran
     via sharad)
 
+   Install sanitized poms for downstream sanity (Luke Lu via mahadev)
+
   INCOMPATIBLE CHANGES
 
     MAPREDUCE-1866. Removes deprecated class

Modified: hadoop/mapreduce/branches/MR-279/assembly/all.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/assembly/all.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/assembly/all.xml (original)
+++ hadoop/mapreduce/branches/MR-279/assembly/all.xml Wed Apr 13 19:42:25 2011
@@ -1,4 +1,3 @@
-
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

Modified: hadoop/mapreduce/branches/MR-279/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/ivy.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/ivy.xml (original)
+++ hadoop/mapreduce/branches/MR-279/ivy.xml Wed Apr 13 19:42:25 2011
@@ -72,12 +72,10 @@
    <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
                conf="checkstyle->default"/>
 
+   <dependency org="org.apache.hadoop" name="yarn-server-common"
+               rev="${yarn.version}" conf="common->default"/>
    <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" 
-               rev="${hadoop-mapreduce-client-core.version}" conf="common->default"/> 
-   <dependency org="org.apache.hadoop" name="yarn-server-common" 
-               rev="${yarn.version}" conf="common->default"/> 
-   <dependency org="org.apache.hadoop" name="yarn-common" 
-               rev="${yarn.version}" conf="common->default"/> 
+               rev="${hadoop-mapreduce.version}" conf="common->default"/>
 
    <dependency org="jdiff" name="jdiff" rev="${jdiff.version}"
                conf="jdiff->default"/>

Modified: hadoop/mapreduce/branches/MR-279/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/ivy/libraries.properties?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/ivy/libraries.properties (original)
+++ hadoop/mapreduce/branches/MR-279/ivy/libraries.properties Wed Apr 13 19:42:25 2011
@@ -34,4 +34,4 @@ rats-lib.version=0.6
 xerces.version=1.4.4
 
 yarn.version=1.0-SNAPSHOT
-hadoop-mapreduce-client-core.version=1.0-SNAPSHOT
+hadoop-mapreduce.version=1.0-SNAPSHOT

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-app/pom.xml Wed Apr 13 19:42:25 2011
@@ -3,35 +3,19 @@
   <parent>
     <artifactId>hadoop-mapreduce-client</artifactId>
     <groupId>org.apache.hadoop</groupId>
-    <version>${yarn.version}</version>
+    <version>${hadoop-mapreduce.version}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce-client-app</artifactId>
   <name>hadoop-mapreduce-client-app</name>
-  <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+  <version>${hadoop-mapreduce.version}</version>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-server</artifactId>
-      <version>${yarn.version}</version>
-      <type>pom</type>
-      <scope>test</scope>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-common</artifactId>
@@ -42,24 +26,20 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-common</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-common</artifactId>
-      <version>${yarn.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-nodemanager</artifactId>
-      <version>${yarn.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-resourcemanager</artifactId>
-      <version>${yarn.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -67,9 +47,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
         <executions>
           <execution>
             <goals>
@@ -80,7 +58,6 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-common/pom.xml Wed Apr 13 19:42:25 2011
@@ -3,79 +3,41 @@
   <parent>
     <artifactId>hadoop-mapreduce-client</artifactId>
     <groupId>org.apache.hadoop</groupId>
-    <version>${yarn.version}</version>
+    <version>${hadoop-mapreduce.version}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce-client-common</artifactId>
   <name>hadoop-mapreduce-client-common</name>
-  <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+  <version>${hadoop-mapreduce.version}</version>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn</artifactId>
-      <version>${yarn.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-server</artifactId>
-      <version>${yarn.version}</version>
-      <type>pom</type>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-core</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.4.0a</version>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <!--plugin>
-        <groupId>org.apache.avro</groupId>
-        <artifactId>avro-maven-plugin</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin-->
-
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>create_generate_src_dirctory</id>
+            <id>create-protobuf-generated-sources-directory</id>
             <phase>initialize</phase>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="target/generated-sources/proto" />
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -87,7 +49,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -113,7 +74,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.5</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -129,12 +89,6 @@
           </execution>
         </executions>
       </plugin>
-
-
-
-
-
-
     </plugins>
   </build>
 </project>

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-core/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-core/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-core/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-core/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,29 +1,34 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
   <parent>
     <artifactId>hadoop-mapreduce-client</artifactId>
     <groupId>org.apache.hadoop</groupId>
-    <version>${yarn.version}</version>
+    <version>${hadoop-mapreduce.version}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce-client-core</artifactId>
-  <name>hadoop-mapreduce-client</name>
-  <version>${yarn.version}</version>
+  <name>hadoop-mapreduce-client-core</name>
+  <version>${hadoop-mapreduce.version}</version>
   <url>http://maven.apache.org</url>
 
   <properties>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
+    <install.file>${project.artifact.file}</install.file>
   </properties>
   
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-common</artifactId> 
-      <version>${yarn.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-hdfs</artifactId>
+      <version>${hadoop-hdfs.version}</version>
     </dependency>
   </dependencies>
 
-<build>
+  <build>
     <plugins>
       <plugin>
         <groupId>org.apache.avro</groupId>
@@ -40,5 +45,4 @@
       </plugin>
     </plugins>
   </build>
-
 </project>

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-hs/pom.xml Wed Apr 13 19:42:25 2011
@@ -3,42 +3,31 @@
   <parent>
     <artifactId>hadoop-mapreduce-client</artifactId>
     <groupId>org.apache.hadoop</groupId>
-    <version>${yarn.version}</version>
+    <version>${hadoop-mapreduce.version}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce-client-hs</artifactId>
   <name>hadoop-mapreduce-client-hs</name>
-  <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+  <version>${hadoop-mapreduce.version}</version>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-common</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-app</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-app</artifactId>
-      <version>${yarn.version}</version>
+      <version>${hadoop-mapreduce.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-jobclient/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,29 +1,21 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
   <parent>
     <artifactId>hadoop-mapreduce-client</artifactId>
     <groupId>org.apache.hadoop</groupId>
-    <version>${yarn.version}</version>
+    <version>${hadoop-mapreduce.version}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
   <name>hadoop-mapreduce-client-jobclient</name>
-  <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+  <version>${hadoop-mapreduce.version}</version>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-common</artifactId>
@@ -37,7 +29,6 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-app</artifactId>
-      <version>${yarn.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -56,19 +47,16 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-nodemanager</artifactId>
-      <version>${yarn.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-resourcemanager</artifactId>
-      <version>${yarn.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-common</artifactId>
-      <version>${yarn.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-shuffle/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-shuffle/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-shuffle/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/hadoop-mapreduce-client-shuffle/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,38 +1,28 @@
-<?xml version="1.0"?><project>
+<?xml version="1.0"?>
+<project>
   <parent>
     <artifactId>hadoop-mapreduce-client</artifactId>
     <groupId>org.apache.hadoop</groupId>
-    <version>${yarn.version}</version>
+    <version>${hadoop-mapreduce.version}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce-client-shuffle</artifactId>
   <name>hadoop-mapreduce-client-shuffle</name>
-  <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+  <version>${hadoop-mapreduce.version}</version>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn</artifactId>
-      <version>${yarn.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-server</artifactId>
-      <version>${yarn.version}</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-nodemanager</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-mapreduce-client-core</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
   </dependencies>
 

Modified: hadoop/mapreduce/branches/MR-279/mr-client/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/mr-client/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/mr-client/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/mr-client/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,155 +1,76 @@
 <?xml version="1.0"?>
 <project>
-  
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.hadoop</groupId>
+    <artifactId>hadoop-mapreduce</artifactId>
+    <version>${hadoop-mapreduce.version}</version>
+  </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce-client</artifactId>
   <name>hadoop-mapreduce-client</name>
-  <version>${yarn.version}</version>
+  <version>${hadoop-mapreduce.version}</version>
   <packaging>pom</packaging>
-  <url>http://maven.apache.org</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <test.logs>true</test.logs>
-    <test.timeout>600000</test.timeout>
-    <hadoop-common.version>0.22.0-SNAPSHOT</hadoop-common.version>
-    <hadoop-hdfs.version>0.22.0-SNAPSHOT</hadoop-hdfs.version>
-    <hadoop-mapred.version>0.22.0-SNAPSHOT</hadoop-mapred.version>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
-  </properties>
-   
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.netty</groupId>
-      <artifactId>netty</artifactId>
-      <version>3.2.3.Final</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common</artifactId>
-      <version>${hadoop-common.version}</version>
-      <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.apache.hadoop</groupId>
-      <artifactId>hadoop-mapred</artifactId>
-      <version>${hadoop-mapred.version}</version>
-    </dependency-->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-common-test</artifactId>
-      <version>${hadoop-common.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdfs</artifactId>
-      <version>${hadoop-hdfs.version}</version>
-    </dependency>
-  </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <!-- begin MNG-4223 workaround -->
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn</artifactId>
+        <version>${yarn.version}</version>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-api</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-server</artifactId>
+        <version>${yarn.version}</version>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-server-common</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <!-- end MNG-4223 workaround -->
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-common</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-server-nodemanager</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-server-resourcemanager</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-mapreduce-client-core</artifactId>
+        <version>${hadoop-mapreduce.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-mapreduce-client-common</artifactId>
+        <version>${hadoop-mapreduce.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-mapreduce-client-app</artifactId>
+        <version>${hadoop-mapreduce.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>findbugs-maven-plugin</artifactId>
-          <version>2.3.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <!-- pre 2.1 ignores project.build.sourceEncoding -->
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <tarLongFileMode>gnu</tarLongFileMode>
-          <descriptors>
-            <descriptor>assembly/all.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin>
-     
-      <plugin>
-       <artifactId>maven-clean-plugin</artifactId>
-       <version>2.4.1</version>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <!-- requires 2.5+ to make system properties work -->
-        <!-- requires 2.7+ to avoid SUREFIRE-640 -->
-        <version>2.7.2</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-          <redirectTestOutputToFile>${test.logs}</redirectTestOutputToFile>
-          <forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
-          <environmentVariables>
-            <JAVA_HOME>${java.home}</JAVA_HOME>
-          </environmentVariables>
-          <systemPropertyVariables>
-            <build.dir>${project.build.directory}</build.dir>
-            <build.output.dir>${project.build.outputDirectory}</build.output.dir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
-      </plugin>
-      <plugin>
-        <groupId>com.atlassian.maven.plugins</groupId>
-        <artifactId>maven-clover2-plugin</artifactId>
-        <version>3.0.2</version>
-        <configuration>
-          <licenseLocation>/home/y/conf/clover/clover.license</licenseLocation>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>instrument</goal>
-              <goal>aggregate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
   <modules>
     <module>hadoop-mapreduce-client-core</module>
     <module>hadoop-mapreduce-client-common</module>

Modified: hadoop/mapreduce/branches/MR-279/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-
-  <groupId>org.apache.hadoop.mapreduce</groupId>
+  <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-mapreduce</artifactId>
   <version>${hadoop-mapreduce.version}</version>
   <packaging>pom</packaging>
-
   <name>hadoop-mapreduce</name>
-  <url>http://maven.apache.org</url>
+  <url>http://hadoop.apache.org/mapreduce/</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,11 +15,21 @@
     <hadoop-common.version>0.22.0-SNAPSHOT</hadoop-common.version>
     <hadoop-hdfs.version>0.22.0-SNAPSHOT</hadoop-hdfs.version>
     <hadoop-mapreduce.version>1.0-SNAPSHOT</hadoop-mapreduce.version>
+    <yarn.version>1.0-SNAPSHOT</yarn.version>
+    <install.file>${project.build.directory}/pom.xml</install.file>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>repository.jboss.org</id>
+      <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
   <dependencies>
-    <!-- The Avro dependency must be defined before hadoop-common to override 
-    the transitive dependency on avro in hadoop-common. -->
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
@@ -108,7 +116,7 @@
       <version>3.2.3.Final</version>
     </dependency>
   </dependencies>
-  
+
   <build>
     <pluginManagement>
       <plugins>
@@ -117,20 +125,127 @@
           <artifactId>findbugs-maven-plugin</artifactId>
           <version>2.3.1</version>
         </plugin>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
+        <plugin>
+          <groupId>com.atlassian.maven.plugins</groupId>
+          <artifactId>maven-clover2-plugin</artifactId>
+          <version>3.0.2</version>
+          <configuration>
+            <licenseLocation>/home/y/conf/clover/clover.license</licenseLocation>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <!-- pre 2.1 ignores project.build.sourceEncoding -->
+          <version>2.3.2</version>
+          <configuration>
+            <source>1.6</source>
+            <target>1.6</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <!-- requires 2.5+ to make system properties work -->
+          <!-- requires 2.7+ to avoid SUREFIRE-640 -->
+          <version>2.7.2</version>
+          <configuration>
+            <failIfNoTests>false</failIfNoTests>
+            <redirectTestOutputToFile>${test.logs}</redirectTestOutputToFile>
+            <forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
+            <environmentVariables>
+              <JAVA_HOME>${java.home}</JAVA_HOME>
+            </environmentVariables>
+            <systemPropertyVariables>
+              <build.dir>${project.build.directory}</build.dir>
+              <build.output.dir>${project.build.outputDirectory}</build.output.dir>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>2.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <!-- pre 2.1 ignores project.build.sourceEncoding -->
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>santize-pom</id>
+            <phase>package</phase>
+            <configuration>
+              <target>
+                <copy file="pom.xml" todir="${project.build.directory}">
+                  <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>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-install-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install-sanitized-pom</id>
+            <configuration>
+              <file>${install.file}</file>
+              <pomFile>${project.build.directory}/pom.xml</pomFile>
+            </configuration>
+            <phase>install</phase>
+            <goals>
+              <goal>install-file</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
-
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
@@ -140,44 +255,9 @@
           </descriptors>
         </configuration>
       </plugin>
-     
-      <plugin>
-       <artifactId>maven-clean-plugin</artifactId>
-       <version>2.4.1</version>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <!-- requires 2.5+ to make system properties work -->
-        <!-- requires 2.7+ to avoid SUREFIRE-640 -->
-        <version>2.7.2</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-          <redirectTestOutputToFile>${test.logs}</redirectTestOutputToFile>
-          <forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
-          <environmentVariables>
-            <JAVA_HOME>${java.home}</JAVA_HOME>
-          </environmentVariables>
-          <systemPropertyVariables>
-            <build.dir>${project.build.directory}</build.dir>
-            <build.output.dir>${project.build.outputDirectory}</build.output.dir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
-      </plugin>
       <plugin>
         <groupId>com.atlassian.maven.plugins</groupId>
         <artifactId>maven-clover2-plugin</artifactId>
-        <version>3.0.2</version>
-        <configuration>
-          <licenseLocation>/home/y/conf/clover/clover.license</licenseLocation>
-        </configuration>
         <executions>
           <execution>
             <goals>
@@ -195,4 +275,19 @@
     <module>mr-client</module>
   </modules>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <configuration>
+          <findbugsXmlOutput>true</findbugsXmlOutput>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.atlassian.maven.plugins</groupId>
+        <artifactId>maven-clover2-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

Modified: hadoop/mapreduce/branches/MR-279/yarn/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-
   <groupId>org.apache.hadoop</groupId>
   <artifactId>yarn</artifactId>
   <version>${yarn.version}</version>
   <packaging>pom</packaging>
-
   <name>yarn</name>
-  <url>http://maven.apache.org</url>
+  <url>http://hadoop.apache.org/mapreduce</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -17,6 +15,7 @@
     <hadoop-common.version>0.22.0-SNAPSHOT</hadoop-common.version>
     <hadoop-hdfs.version>0.22.0-SNAPSHOT</hadoop-hdfs.version>
     <yarn.version>1.0-SNAPSHOT</yarn.version>
+    <install.file>${project.build.directory}/pom.xml</install.file>
   </properties>
 
   <repositories>
@@ -30,8 +29,6 @@
   </repositories>
 
   <dependencies>
-    <!-- The Avro dependency must be defined before hadoop-common to override 
-    the transitive dependency on avro in hadoop-common. -->
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
@@ -64,11 +61,20 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>2.4.0a</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
       <version>${hadoop-common.version}</version>
       <exclusions>
         <exclusion>
+          <groupId>org.apache.avro</groupId>
+          <artifactId>avro</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>commons-el</groupId>
           <artifactId>commons-el</artifactId>
         </exclusion>
@@ -114,6 +120,56 @@
     </dependency>
   </dependencies>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-api</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-common</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-server-common</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-server-resourcemanager</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>yarn-server-nodemanager</artifactId>
+        <version>${yarn.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>3.3.1</version>
+        <exclusions>
+          <exclusion>
+            <!-- otherwise seems to drag in junit 3.8.1 via jline -->
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jdmk</groupId>
+            <artifactId>jmxtools</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>com.sun.jmx</groupId>
+            <artifactId>jmxri</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -122,21 +178,76 @@
           <artifactId>findbugs-maven-plugin</artifactId>
           <version>2.3.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <!-- pre 2.1 ignores project.build.sourceEncoding -->
+          <version>2.3.2</version>
+          <configuration>
+            <source>1.6</source>
+            <target>1.6</target>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.4.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <!-- requires 2.5+ to make system properties work -->
+          <!-- requires 2.7+ to avoid SUREFIRE-640 -->
+          <version>2.7.2</version>
+          <configuration>
+            <failIfNoTests>false</failIfNoTests>
+            <redirectTestOutputToFile>${test.logs}</redirectTestOutputToFile>
+            <forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
+            <environmentVariables>
+              <JAVA_HOME>${java.home}</JAVA_HOME>
+            </environmentVariables>
+            <systemPropertyVariables>
+              <build.dir>${project.build.directory}</build.dir>
+              <build.output.dir>${project.build.outputDirectory}</build.output.dir>
+            </systemPropertyVariables>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>com.atlassian.maven.plugins</groupId>
+          <artifactId>maven-clover2-plugin</artifactId>
+          <version>3.0.2</version>
+          <configuration>
+            <licenseLocation>/home/y/conf/clover/clover.license</licenseLocation>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.3.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <!-- pre 2.1 ignores project.build.sourceEncoding -->
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <tarLongFileMode>gnu</tarLongFileMode>
@@ -145,49 +256,53 @@
           </descriptors>
         </configuration>
       </plugin>
-     
-      <plugin>
-       <artifactId>maven-clean-plugin</artifactId>
-       <version>2.4.1</version>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <!-- requires 2.5+ to make system properties work -->
-        <!-- requires 2.7+ to avoid SUREFIRE-640 -->
-        <version>2.7.2</version>
-        <configuration>
-          <failIfNoTests>false</failIfNoTests>
-          <redirectTestOutputToFile>${test.logs}</redirectTestOutputToFile>
-          <forkedProcessTimeoutInSeconds>${test.timeout}</forkedProcessTimeoutInSeconds>
-          <environmentVariables>
-            <JAVA_HOME>${java.home}</JAVA_HOME>
-          </environmentVariables>
-          <systemPropertyVariables>
-            <build.dir>${project.build.directory}</build.dir>
-            <build.output.dir>${project.build.outputDirectory}</build.output.dir>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
+        <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" todir="${project.build.directory}">
+                  <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>
-        <groupId>com.atlassian.maven.plugins</groupId>
-        <artifactId>maven-clover2-plugin</artifactId>
-        <version>3.0.2</version>
-        <configuration>
-          <licenseLocation>/home/y/conf/clover/clover.license</licenseLocation>
-        </configuration>
+        <artifactId>maven-install-plugin</artifactId>
         <executions>
           <execution>
+            <id>install-sanitized-pom</id>
+            <configuration>
+              <file>${install.file}</file>
+              <pomFile>${project.build.directory}/pom.xml</pomFile>
+            </configuration>
+            <phase>install</phase>
             <goals>
-              <goal>instrument</goal>
-              <goal>aggregate</goal>
+              <goal>install-file</goal>
             </goals>
           </execution>
         </executions>
@@ -199,21 +314,4 @@
     <module>yarn-common</module>
     <module>yarn-server</module>
   </modules>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
-       <configuration> 
-          <findbugsXmlOutput>true</findbugsXmlOutput>
-       </configuration> 
-      </plugin>
-      <plugin>
-        <groupId>com.atlassian.maven.plugins</groupId>
-        <artifactId>maven-clover2-plugin</artifactId>
-        <version>3.0.2</version>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-api/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-api/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-api/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-api/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,10 +1,5 @@
-<?xml version="1.0"?><project>
-
-  <properties>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
-  </properties>
-
-
+<?xml version="1.0"?>
+<project xmlns:pom="http://maven.apache.org/POM/4.0.0">
   <parent>
     <artifactId>yarn</artifactId>
     <groupId>org.apache.hadoop</groupId>
@@ -15,34 +10,23 @@
   <artifactId>yarn-api</artifactId>
   <name>yarn-api</name>
   <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
+
   <build>
     <plugins>
-      <!--plugin>
-        <groupId>org.apache.avro</groupId>
-        <artifactId>avro-maven-plugin</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin-->
-
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>create_generate_src_dirctory</id>
+            <id>create-protobuf-generated-sources-directory</id>
             <phase>initialize</phase>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="target/generated-sources/proto" />
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -54,7 +38,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -62,7 +45,7 @@
             <configuration>
               <executable>protoc</executable>
               <arguments>
-				<argument>-Isrc/main/proto/</argument>
+                <argument>-Isrc/main/proto/</argument>
                 <argument>--java_out=target/generated-sources/proto</argument>
                 <argument>src/main/proto/yarn_protos.proto</argument>
                 <argument>src/main/proto/yarn_service_protos.proto</argument>
@@ -81,7 +64,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.5</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -97,18 +79,7 @@
           </execution>
         </executions>
       </plugin>
-
-
     </plugins>
   </build>
 
-  <dependencies>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.4.0a</version>
-    </dependency>
-  </dependencies>
-
-
 </project>

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-common/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-common/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-common/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,9 +1,5 @@
-<?xml version="1.0"?><project>
-
-  <properties>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
-  </properties>
-
+<?xml version="1.0"?>
+<project>
   <parent>
     <artifactId>yarn</artifactId>
     <groupId>org.apache.hadoop</groupId>
@@ -14,48 +10,42 @@
   <artifactId>yarn-common</artifactId>
   <name>yarn-common</name>
   <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
-    <dependency>
-          <groupId>com.google.protobuf</groupId>
-          <artifactId>protobuf-java</artifactId>
-          <version>2.4.0a</version>
-      </dependency>
   </dependencies>
 
   <build>
     <plugins>
-     <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-jar-plugin</artifactId>
-       <version>2.3.1</version>
-       <executions>
-         <execution>
-           <goals>
-             <goal>test-jar</goal>
-           </goals>
-           <phase>test-compile</phase>
-         </execution>
-       </executions>
-     </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <phase>test-compile</phase>
+          </execution>
+        </executions>
+      </plugin>
      
-          <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
+      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>create_generate_src_dirctory</id>
+            <id>create-protobuf-generated-sources-directory</id>
             <phase>initialize</phase>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="target/generated-sources/proto" />
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -67,7 +57,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -91,7 +80,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.5</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -107,13 +95,6 @@
           </execution>
         </executions>
       </plugin>
-     
-     
-     
-     
-     
-     
-     
     </plugins>
   </build>
 </project>

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,9 +1,5 @@
-<?xml version="1.0"?><project>
-
-  <properties>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
-  </properties>
-
+<?xml version="1.0"?>
+<project>
   <parent>
     <artifactId>yarn</artifactId>
     <groupId>org.apache.hadoop</groupId>
@@ -15,16 +11,8 @@
   <name>yarn-server</name>
   <version>${yarn.version}</version>
   <packaging>pom</packaging>
-  <url>http://maven.apache.org</url>
 
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-common</artifactId>

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-common/pom.xml Wed Apr 13 19:42:25 2011
@@ -9,70 +9,35 @@
   <groupId>org.apache.hadoop</groupId>
   <artifactId>yarn-server-common</artifactId>
   <name>yarn-server-common</name>
+  <version>${yarn.version}</version>
 
   <properties>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
+    <install.file>${project.artifact.file}</install.file>
   </properties>
 
-  <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
-      <version>3.3.1</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>com.sun.jdmk</groupId>
-          <artifactId>jmxtools</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jmx</groupId>
-          <artifactId>jmxri</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.4.0a</version>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
-      <!--plugin>
-        <groupId>org.apache.avro</groupId>
-        <artifactId>avro-maven-plugin</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin-->
-
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>create_generate_src_dirctory</id>
+            <id>create-protobuf-generated-sources-directory</id>
             <phase>initialize</phase>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="target/generated-sources/proto" />
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -84,7 +49,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -110,7 +74,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.5</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -126,10 +89,6 @@
           </execution>
         </executions>
       </plugin>
-
-
-
-
     </plugins>
   </build>
 </project>

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/pom.xml Wed Apr 13 19:42:25 2011
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 <project>
-
-  <properties>
-    <yarn.version>1.0-SNAPSHOT</yarn.version>
-  </properties>
-
   <parent>
     <artifactId>yarn-server</artifactId>
     <groupId>org.apache.hadoop</groupId>
@@ -15,30 +10,15 @@
   <artifactId>yarn-server-nodemanager</artifactId>
   <name>yarn-server-nodemanager</name>
   <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-common</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.4.0a</version>
     </dependency>
   </dependencies>
 
@@ -115,45 +95,30 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <systemProperties>
+          <systemPropertyVariables>
             <property>
               <name>container-executor-path</name>
               <value></value>
             </property>
-          </systemProperties>
+          </systemPropertyVariables>
           <excludes>
             <exclude>**/TestFSDownload.java</exclude>
           </excludes>
         </configuration>
       </plugin>
-      <!--plugin>
-        <groupId>org.apache.avro</groupId>
-        <artifactId>avro-maven-plugin</artifactId>
-        <version>1.4.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin-->
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>create_generate_src_dirctory</id>
+            <id>create-protobuf-generated-sources-directory</id>
             <phase>initialize</phase>
             <configuration>
-              <tasks>
+              <target>
                 <mkdir dir="target/generated-sources/proto" />
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -165,7 +130,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2</version>
         <executions>
           <execution>
             <id>generate-sources</id>
@@ -190,7 +154,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.5</version>
         <executions>
           <execution>
             <id>add-source</id>
@@ -206,7 +169,6 @@
           </execution>
         </executions>
       </plugin>
-
     </plugins>
   </build>
 </project>

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-resourcemanager/pom.xml Wed Apr 13 19:42:25 2011
@@ -10,25 +10,15 @@
   <artifactId>yarn-server-resourcemanager</artifactId>
   <name>yarn-server-resourcemanager</name>
   <version>${yarn.version}</version>
-  <url>http://maven.apache.org</url>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
 
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-common</artifactId>
-      <version>${yarn.version}</version>
     </dependency>
   </dependencies>
 

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-tests/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-tests/pom.xml?rev=1091896&r1=1091895&r2=1091896&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-tests/pom.xml (original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-tests/pom.xml Wed Apr 13 19:42:25 2011
@@ -9,48 +9,30 @@
   <artifactId>yarn-server-tests</artifactId>
   <name>yarn-server-tests</name>
   <version>${yarn.version}</version>
+
+  <properties>
+    <install.file>${project.artifact.file}</install.file>
+  </properties>
+
   <dependencies>
-    <!-- begin MNG-4223 workaround -->
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-api</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>yarn-common</artifactId>
-      <version>${yarn.version}</version>
-    </dependency>
-    <!-- end MNG-4223 workaround -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-common</artifactId>
-      <version>${yarn.version}</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-nodemanager</artifactId>
-      <version>${yarn.version}</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>yarn-server-resourcemanager</artifactId>
-      <version>${yarn.version}</version>
-      <type>jar</type>
-      <scope>compile</scope>
     </dependency>
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
         <executions>
           <execution>
             <goals>