Updated Branches:
refs/heads/master d8cc98c8b -> 68a54c7e2
revert ${maven-compile.jvmargs} usage as look to fail on ci but not locally ,
sorry olamy != ant guru :-)
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/68a54c7e
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/68a54c7e
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/68a54c7e
Branch: refs/heads/master
Commit: 68a54c7e227702fce27a597b3e589afca9090c13
Parents: d8cc98c
Author: olivier lamy <[email protected]>
Authored: Fri Dec 14 15:29:00 2012 +0100
Committer: olivier lamy <[email protected]>
Committed: Fri Dec 14 15:29:15 2012 +0100
----------------------------------------------------------------------
build.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/68a54c7e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 2dcf094..6b93808 100644
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,7 @@ END SNIPPET: ant-bootstrap -->
<property name="it.workdir.version" value="3.0.x" />
<property name="maven-compile.jvmargs" value="-Xmx512m -Xms512m"/>
<property name="maven-compile.fork" value="true"/>
+ <property name="maven-compile.maxmemory" value="512m"/>
<target name="initTaskDefs">
<echo>Building ${distributionName} ...</echo>
@@ -249,9 +250,9 @@ Do you want to continue?</input>
</target>
<target name="maven-compile" depends="compile-boot,process-classes"
description="compiles Maven using the bootstrap Maven, skipping automated
tests">
- <java fork="${maven-compile.fork}"
classname="org.apache.maven.cli.MavenCli" failonerror="true" timeout="600000">
<!-- maxmemory="512m"> -->
+ <java fork="${maven-compile.fork}"
classname="org.apache.maven.cli.MavenCli" failonerror="true" timeout="600000"
maxmemory="${maven-compile.maxmemory}">
<!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/-->
- <jvmarg value="${maven-compile.jvmargs}"/>
+ <!--jvmarg value="${maven-compile.jvmargs}"/-->
<classpath refid="maven.classpath" />
<arg value="${maven.debug}" />
<arg value="-B" />
