hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r1524865 - in /hadoop/common/branches/HDFS-4949: ./ hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml hadoop-dist/pom.xml hadoop-project/pom.xml
Date Thu, 19 Sep 2013 23:42:18 GMT
Author: wang
Date: Thu Sep 19 23:42:10 2013
New Revision: 1524865

URL: http://svn.apache.org/r1524865
Log:
merge changes from trunk to HDFS-4949 branch

Added:
    hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
      - copied unchanged from r1522706, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-hdfs-nfs-dist.xml
    hadoop/common/branches/HDFS-4949/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
      - copied unchanged from r1522706, hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-nfs-dist.xml
Modified:
    hadoop/common/branches/HDFS-4949/   (props changed)
    hadoop/common/branches/HDFS-4949/hadoop-dist/pom.xml
    hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml

Propchange: hadoop/common/branches/HDFS-4949/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1514105-1522706

Modified: hadoop/common/branches/HDFS-4949/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-dist/pom.xml?rev=1524865&r1=1524864&r2=1524865&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-dist/pom.xml Thu Sep 19 23:42:10 2013
@@ -115,8 +115,10 @@
                       run mkdir hadoop-${project.version}
                       run cd hadoop-${project.version}
                       run cp -r $ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/*
.
+                      run cp -r $ROOT/hadoop-common-project/hadoop-nfs/target/hadoop-nfs-${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-hdfs-project/hadoop-hdfs-nfs/target/hadoop-hdfs-nfs-${project.version}/*
.
                       run cp -r $ROOT/hadoop-yarn-project/target/hadoop-yarn-project-${project.version}/*
.
                       run cp -r $ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/*
.
                       run cp -r $ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/*
.

Modified: hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml?rev=1524865&r1=1524864&r2=1524865&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-4949/hadoop-project/pom.xml Thu Sep 19 23:42:10 2013
@@ -664,6 +664,13 @@
         </exclusions>
       </dependency>
       <dependency>
+        <groupId>org.apache.zookeeper</groupId>
+        <artifactId>zookeeper</artifactId>
+        <version>3.4.2</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
         <groupId>org.apache.bookkeeper</groupId>
         <artifactId>bookkeeper-server</artifactId>
         <version>4.0.0</version>
@@ -706,7 +713,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12.3</version>
+          <version>2.16</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -820,7 +827,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>always</forkMode>
+          <reuseForks>false</reuseForks>
           <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
           <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine>
           <environmentVariables>
@@ -995,23 +1002,5 @@
         </plugins>
       </build>
     </profile>
-    <!-- Copied into specific modules supporting parallel testing. Will be uncommented
as soon as all modules support this.
-    <profile>
-      <id>parallel-tests</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <forkMode>perthread</forkMode>
-              <threadCount>${testsThreadCount}</threadCount>
-              <parallel>classes</parallel>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    -->
   </profiles>
 </project>



Mime
View raw message