Author: wang Date: Tue Aug 5 02:30:54 2014 New Revision: 1615844 URL: http://svn.apache.org/r1615844 Log: Merge from trunk to branch
Modified: hadoop/common/branches/fs-encryption/ (props changed) hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml hadoop/common/branches/fs-encryption/hadoop-project/pom.xml Propchange: hadoop/common/branches/fs-encryption/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1614551-1615843 Modified: hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml?rev=1615844&r1=1615843&r2=1615844&view=diff ============================================================================== --- hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml (original) +++ hadoop/common/branches/fs-encryption/hadoop-project-dist/pom.xml Tue Aug 5 02:30:54 2014 @@ -102,6 +102,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/fs-encryption/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/fs-encryption/hadoop-project/pom.xml?rev=1615844&r1=1615843&r2=1615844&view=diff ============================================================================== --- hadoop/common/branches/fs-encryption/hadoop-project/pom.xml (original) +++ hadoop/common/branches/fs-encryption/hadoop-project/pom.xml Tue Aug 5 02:30:54 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>