diff --git a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java index 0868df55c2..d5efe611a7 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenBuild.java @@ -180,7 +180,9 @@ public class MavenBuild extends AbstractBuild { @Override public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedException { EnvVars envs = super.getEnvironment(log); - envs.put("MAVEN_OPTS",project.getParent().getMavenOpts()); + String opts = project.getMavenOpts(); + if(opts!=null) + envs.put("MAVEN_OPTS", opts); return envs; } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index f4e1609e14..41bcca4459 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -123,7 +123,9 @@ public final class MavenModuleSetBuild extends AbstractBuild