hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1190616 - in /hadoop/common/branches/branch-0.23: hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml hadoop-dist/ hadoop-dist/pom.xml hadoop-project/pom.xml pom.xml
Date Fri, 28 Oct 2011 21:57:39 GMT
Author: tucu
Date: Fri Oct 28 21:57:38 2011
New Revision: 1190616

URL: http://svn.apache.org/viewvc?rev=1190616&view=rev
Log:
Merge -r 1182150:1182151 from trunk to branch. FIXES: HADOOP-7642

Added:
    hadoop/common/branches/branch-0.23/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
      - copied unchanged from r1182151, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml
    hadoop/common/branches/branch-0.23/hadoop-dist/
      - copied from r1182151, hadoop/common/trunk/hadoop-dist/
    hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml
      - copied, changed from r1182151, hadoop/common/trunk/hadoop-dist/pom.xml
Modified:
    hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
    hadoop/common/branches/branch-0.23/pom.xml

Copied: hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml (from r1182151, hadoop/common/trunk/hadoop-dist/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml?p2=hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml&p1=hadoop/common/trunk/hadoop-dist/pom.xml&r1=1182151&r2=1190616&rev=1190616&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml Fri Oct 28 21:57:38 2011
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.apache.hadoop</groupId>
     <artifactId>hadoop-project</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.23.0-SNAPSHOT</version>
     <relativePath>../hadoop-project</relativePath>
   </parent>
   <groupId>org.apache.hadoop</groupId>
   <artifactId>hadoop-dist</artifactId>
-  <version>0.24.0-SNAPSHOT</version>
+  <version>0.23.0-SNAPSHOT</version>
   <description>Apache Hadoop Distribution</description>
   <name>Apache Hadoop Distribution</name>
   <packaging>jar</packaging>

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=1190616&r1=1190615&r2=1190616&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 21:57:38 2011
@@ -111,6 +111,21 @@
         <artifactId>hadoop-auth</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-hdfs</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-mapreduce-client-app</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-yarn-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>com.google.guava</groupId>

Modified: hadoop/common/branches/branch-0.23/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/pom.xml?rev=1190616&r1=1190615&r2=1190616&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/pom.xml Fri Oct 28 21:57:38 2011
@@ -41,6 +41,7 @@
     <module>hadoop-hdfs-project</module>
     <module>hadoop-mapreduce-project</module>
     <module>hadoop-tools</module>
+    <module>hadoop-dist</module>
   </modules>
 
   <build>



Mime
View raw message