You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/12/14 15:00:27 UTC
[1/2] git commit: make fork or not configurable for ci testing
Updated Branches:
refs/heads/master 87952bd07 -> d8cc98c8b
make fork or not configurable for ci testing
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d8cc98c8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d8cc98c8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d8cc98c8
Branch: refs/heads/master
Commit: d8cc98c8be85f87e205e08c9783ce4269ab479d2
Parents: a40df3a
Author: olivier lamy <ol...@apache.org>
Authored: Fri Dec 14 15:00:10 2012 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Fri Dec 14 15:00:10 2012 +0100
----------------------------------------------------------------------
build.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d8cc98c8/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 14628b2..2dcf094 100644
--- a/build.xml
+++ b/build.xml
@@ -36,6 +36,8 @@ END SNIPPET: ant-bootstrap -->
<property name="distributionShortName" value="Maven"/>
<property name="distributionName" value="Apache Maven"/>
<property name="it.workdir.version" value="3.0.x" />
+ <property name="maven-compile.jvmargs" value="-Xmx512m -Xms512m"/>
+ <property name="maven-compile.fork" value="true"/>
<target name="initTaskDefs">
<echo>Building ${distributionName} ...</echo>
@@ -247,9 +249,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="true" 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="512m"> -->
<!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/-->
- <jvmarg value="-Xmx512m -Xms512m"/>
+ <jvmarg value="${maven-compile.jvmargs}"/>
<classpath refid="maven.classpath" />
<arg value="${maven.debug}" />
<arg value="-B" />