Skip to content

Commit 309fb22

Browse files
authored
Build: forked compiler max memory matches jvmArgs (#33138)
This commit removes the setting of the fork options maximum memory size in our build plugin and instead adds the value in the gradle.properties file to be alongside the value set in jvmArgs. This change is necessary when using parallel compilation as 512m is not sufficient for parallel compilation on some machines.
1 parent 2aef7e0 commit 309fb22

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,6 @@ class BuildPlugin implements Plugin<Project> {
601601
} else {
602602
options.fork = true
603603
options.forkOptions.javaHome = compilerJavaHomeFile
604-
options.forkOptions.memoryMaximumSize = "512m"
605604
}
606605
if (targetCompatibilityVersion == JavaVersion.VERSION_1_8) {
607606
// compile with compact 3 profile by default

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
org.gradle.daemon=false
22
org.gradle.jvmargs=-Xmx2g
3+
options.forkOptions.memoryMaximumSize=2g

0 commit comments

Comments
 (0)