Repository: hadoop Updated Branches: refs/heads/branch-2 9d72b0282 -> a7be36384 refs/heads/trunk db73cc912 -> 394c70c21
HADOOP-11363 Hadoop maven surefire-plugin uses must set heap size. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a7be3638 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a7be3638 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a7be3638 Branch: refs/heads/branch-2 Commit: a7be36384ae3aa1eed4b08154cb63710110b466d Parents: 9d72b02 Author: Steve Loughran <ste...@apache.org> Authored: Tue Dec 9 11:04:59 2014 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Dec 9 11:04:59 2014 +0000 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ hadoop-project/pom.xml | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a7be3638/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e842fe6..3d13918 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -161,6 +161,8 @@ Release 2.7.0 - UNRELEASED 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 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a7be3638/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 76b8645..d50b72c 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -84,6 +84,12 @@ --> <enforced.java.version>[${javac.version},)</enforced.java.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> <dependencyManagement> @@ -948,7 +954,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.16</version> + <version>${maven-surefire-plugin.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1097,7 +1103,7 @@ <configuration> <reuseForks>false</reuseForks> <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds> - <argLine>-Xmx1024m -XX:+HeapDumpOnOutOfMemoryError</argLine> + <argLine>${maven-surefire-plugin.argLine}</argLine> <environmentVariables> <!-- HADOOP_HOME required for tests on Windows to find winutils --> <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>