Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11363 Hadoop maven surefire-plugin uses must set heap size.

This commit is contained in:
Steve Loughran 2014-12-09 11:04:59 +00:00
parent db73cc9124
commit 394c70c21d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -524,6 +524,8 @@ Release 2.7.0 - UNRELEASED
HADOOP-11329. Add JAVA_LIBRARY_PATH to KMS startup options. (Arun Suresh via wang) HADOOP-11329. Add JAVA_LIBRARY_PATH to KMS startup options. (Arun Suresh via wang)
HADOOP-11363 Hadoop maven surefire-plugin uses must set heap size. (stevel)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

10
hadoop-project/pom.xml
View File

@ -84,6 +84,12 @@
--> -->
<enforced.java.version>[${javac.version},)</enforced.java.version> <enforced.java.version>[${javac.version},)</enforced.java.version>
<enforced.maven.version>[3.0.2,)</enforced.maven.version> <enforced.maven.version>[3.0.2,)</enforced.maven.version>
<!-- Plugin versions and config -->
<maven-surefire-plugin.argLine>-Xmx4096m -XX:MaxPermSize=768m -XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine>
<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -950,7 +956,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version> <version>${maven-surefire-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1061,7 +1067,7 @@
<configuration> <configuration>
<reuseForks>false</reuseForks> <reuseForks>false</reuseForks>
<forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds> <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
<argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine> <argLine>${maven-surefire-plugin.argLine}</argLine>
<environmentVariables> <environmentVariables>
<!-- HADOOP_HOME required for tests on Windows to find winutils --> <!-- HADOOP_HOME required for tests on Windows to find winutils -->
<HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME> <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>