You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2014/08/01 03:29:52 UTC

svn commit: r1615020 - in /hadoop/common/branches/HDFS-6584: ./ hadoop-project-dist/pom.xml hadoop-project/pom.xml

Author: szetszwo
Date: Fri Aug  1 01:29:49 2014
New Revision: 1615020

URL: http://svn.apache.org/r1615020
Log:
Merge r1609845 through r1615019 from trunk.

Modified:
    hadoop/common/branches/HDFS-6584/   (props changed)
    hadoop/common/branches/HDFS-6584/hadoop-project-dist/pom.xml
    hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml

Propchange: hadoop/common/branches/HDFS-6584/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1614232-1615019

Modified: hadoop/common/branches/HDFS-6584/hadoop-project-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-project-dist/pom.xml?rev=1615020&r1=1615019&r2=1615020&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6584/hadoop-project-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-6584/hadoop-project-dist/pom.xml Fri Aug  1 01:29:49 2014
@@ -100,6 +100,8 @@
         <artifactId>findbugs-maven-plugin</artifactId>
         <configuration>
           <excludeFilterFile>${basedir}/dev-support/findbugsExcludeFile.xml</excludeFilterFile>
+          <fork>true</fork>
+          <maxHeap>2048</maxHeap>
         </configuration>
       </plugin>
       <plugin>

Modified: hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml?rev=1615020&r1=1615019&r2=1615020&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-6584/hadoop-project/pom.xml Fri Aug  1 01:29:49 2014
@@ -789,7 +789,13 @@
         <groupId>com.microsoft.windowsazure.storage</groupId>
         <artifactId>microsoft-windowsazure-storage-sdk</artifactId>
         <version>0.6.0</version>
-    </dependency>
+     </dependency>
+
+     <dependency>
+       <groupId>xerces</groupId>
+       <artifactId>xercesImpl</artifactId>
+       <version>2.9.1</version>
+     </dependency>
       
     </dependencies>
   </dependencyManagement>