hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1213389 - in /hadoop/common/branches/HDFS-1623: ./ .gitignore hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml hadoop-dist/pom.xml hadoop-project/pom.xml
Date Mon, 12 Dec 2011 19:41:28 GMT
Author: atm
Date: Mon Dec 12 19:41:20 2011
New Revision: 1213389

URL: http://svn.apache.org/viewvc?rev=1213389&view=rev
Log:
Merge trunk into HA branch.

Added:
    hadoop/common/branches/HDFS-1623/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml
      - copied unchanged from r1213339, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-httpfs-dist.xml
Modified:
    hadoop/common/branches/HDFS-1623/   (props changed)
    hadoop/common/branches/HDFS-1623/.gitignore
    hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml
    hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml

Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 12 19:41:20 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1211747
+/hadoop/common/trunk:1152502-1213339

Modified: hadoop/common/branches/HDFS-1623/.gitignore
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/.gitignore?rev=1213389&r1=1213388&r2=1213389&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/.gitignore (original)
+++ hadoop/common/branches/HDFS-1623/.gitignore Mon Dec 12 19:41:20 2011
@@ -8,3 +8,4 @@
 .settings
 target
 hadoop-hdfs-project/hadoop-hdfs/downloads
+hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads

Modified: hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml?rev=1213389&r1=1213388&r2=1213389&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-dist/pom.xml Mon Dec 12 19:41:20 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/HDFS-1623/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml?rev=1213389&r1=1213388&r2=1213389&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-project/pom.xml Mon Dec 12 19:41:20 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>
@@ -433,6 +439,16 @@
         <artifactId>jsch</artifactId>
         <version>0.1.42</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>
 
@@ -457,7 +473,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