Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2014-08-21 16:26:52 +01:00
parent 0e7757decd 9717b7d840
commit 2ed24ddcd5
7 changed files with 161 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-tools/spring-boot-gradle-plugin/src/main/groovy/org/springframework/boot/gradle/agent/AgentTasksEnhancer.java
View File

@@ -108,6 +108,11 @@ public class AgentTasksEnhancer implements Action<Project> {
if (this.noverify != null && this.noverify) {
exec.jvmArgs("-noverify");
}
Iterable<?> defaultJvmArgs = exec.getConventionMapping().getConventionValue(
null, "jvmArgs", false);
if (defaultJvmArgs != null) {
exec.jvmArgs(defaultJvmArgs);
}
}
}