hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1212064 - in /hadoop/common/branches/branch-0.23: .gitignore hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml hadoop-dist/pom.xml hadoop-project/pom.xml
Date Thu, 08 Dec 2011 19:30:58 GMT
Author: tucu
Date: Thu Dec  8 19:30:53 2011
New Revision: 1212064

URL: http://svn.apache.org/viewvc?rev=1212064&view=rev
Log:
Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178

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

Modified: hadoop/common/branches/branch-0.23/.gitignore
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/.gitignore?rev=1212064&r1=1212063&r2=1212064&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/.gitignore (original)
+++ hadoop/common/branches/branch-0.23/.gitignore Thu Dec  8 19:30:53 2011
@@ -8,3 +8,4 @@
 .settings
 target
 hadoop-hdfs-project/hadoop-hdfs/downloads
+hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads

Modified: hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml?rev=1212064&r1=1212063&r2=1212064&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-dist/pom.xml Thu Dec  8 19:30:53 2011
@@ -112,6 +112,7 @@
                       run cd hadoop-${project.version}
                       run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/*
.
                       run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/*
.
+                      run cp -r $ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/*
.
                       run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/*
.
                       COMMON_LIB=share/hadoop/common/lib
                       MODULES=../../../../modules

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=1212064&r1=1212063&r2=1212064&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Thu Dec  8 19:30:53 2011
@@ -90,6 +90,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
+        <artifactId>hadoop-hdfs</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-mapreduce-client-app</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -428,6 +434,16 @@
         <artifactId>commons-daemon</artifactId>
         <version>${commons-daemon.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.jdom</groupId>
+        <artifactId>jdom</artifactId>
+        <version>1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>com.googlecode.json-simple</groupId>
+        <artifactId>json-simple</artifactId>
+        <version>1.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -452,7 +468,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.9</version>
+          <version>2.10</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message