diff --git a/core/src/main/java/hudson/maven/MavenBuild.java b/core/src/main/java/hudson/maven/MavenBuild.java index 8e0b8d7c16..e34792b433 100644 --- a/core/src/main/java/hudson/maven/MavenBuild.java +++ b/core/src/main/java/hudson/maven/MavenBuild.java @@ -220,7 +220,11 @@ public class MavenBuild extends AbstractBuild { } } - // UGLY.... + /** + * Builds the command line argument list to launch the maven process. + * + * UGLY. + */ private ArgumentListBuilder buildMavenCmdLine(BuildListener listener) throws IOException, InterruptedException { MavenInstallation mvn = getParent().getParent().getMaven(); if(mvn==null) { @@ -251,6 +255,8 @@ public class MavenBuild extends AbstractBuild { if(debugPort!=0) args.add("-Xrunjdwp:transport=dt_socket,server=y,address="+debugPort); + args.addTokenized(getParent().getParent().getMavenOpts()); + args.add("-cp"); args.add( (isMaster?Which.jarFile(Main.class).getAbsolutePath():slaveRoot.child("maven-agent.jar").getRemote())+ diff --git a/core/src/main/java/hudson/maven/MavenModuleSet.java b/core/src/main/java/hudson/maven/MavenModuleSet.java index 4079fb20f9..d529fefe6e 100644 --- a/core/src/main/java/hudson/maven/MavenModuleSet.java +++ b/core/src/main/java/hudson/maven/MavenModuleSet.java @@ -70,6 +70,11 @@ public final class MavenModuleSet extends AbstractProjectMAVEN_OPTS. Can be null. + */ + private String mavenOpts; + public MavenModuleSet(String name) { super(Hudson.getInstance(),name); } @@ -280,6 +285,14 @@ public final class MavenModuleSet extends AbstractProject + + + + + diff --git a/war/resources/help/maven/maven-opts.html b/war/resources/help/maven/maven-opts.html new file mode 100644 index 0000000000..ea95abc080 --- /dev/null +++ b/war/resources/help/maven/maven-opts.html @@ -0,0 +1,5 @@ +
+ Specify JVM options needed when launching Maven as an external process. + Also see MAVEN_OPTS documentation + (even though this is for Maven 1.x it still applies to Maven 2.x) +
\ No newline at end of file