Repository: hadoop Updated Branches: refs/heads/branch-3.0 24b03eb79 -> 24ac7c6e7
Revert "HADOOP-13514. Upgrade maven surefire plugin to 2.19.1." This reverts commit 372997f3954e97200220ebb3117eed4a175f101c. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/24ac7c6e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/24ac7c6e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/24ac7c6e Branch: refs/heads/branch-3.0 Commit: 24ac7c6e7999421d4a69cd542d404a98c5444167 Parents: 24b03eb Author: Akira Ajisaka <[email protected]> Authored: Fri Oct 13 18:01:50 2017 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Fri Oct 13 18:01:50 2017 +0900 ---------------------------------------------------------------------- BUILDING.txt | 4 ++-- dev-support/docker/Dockerfile | 2 +- hadoop-project/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ac7c6e/BUILDING.txt ---------------------------------------------------------------------- diff --git a/BUILDING.txt b/BUILDING.txt index 9955563..47aaab4 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -331,10 +331,10 @@ If the build process fails with an out of memory error, you should be able to fi it by increasing the memory used by maven which can be done via the environment variable MAVEN_OPTS. -Here is an example setting to allocate between 256 MB and 1 GB of heap space to +Here is an example setting to allocate between 256 and 512 MB of heap space to Maven -export MAVEN_OPTS="-Xms256m -Xmx1g" +export MAVEN_OPTS="-Xms256m -Xmx512m" ---------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ac7c6e/dev-support/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index 1ced9ef..31ac611 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -147,7 +147,7 @@ RUN pip install python-dateutil ### # Avoid out of memory errors in builds ### -ENV MAVEN_OPTS -Xms256m -Xmx1g +ENV MAVEN_OPTS -Xms256m -Xmx512m ### # Install node js tools for web UI frameowkr http://git-wip-us.apache.org/repos/asf/hadoop/blob/24ac7c6e/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index fe38f24..8aa4052 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -116,7 +116,7 @@ <!-- Plugin versions and config --> <maven-surefire-plugin.argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError</maven-surefire-plugin.argLine> - <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> + <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> @@ -1545,7 +1545,7 @@ <test.build.data>${test.build.data}</test.build.data> <test.build.webapps>${test.build.webapps}</test.build.webapps> <test.cache.data>${test.cache.data}</test.cache.data> - <test.build.classes>${project.build.directory}/test-classes</test.build.classes> + <test.build.classes>${test.build.classes}</test.build.classes> <java.net.preferIPv4Stack>true</java.net.preferIPv4Stack> <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
