Remove custom `MAVEN_OPTS` in favor of `.mvn/jvm.config`
def buildNumber = BUILD_NUMBER as int; if (buildNumber > 1) milestone(buildNumber - 1); milestone(buildNumber) // JENKINS-43353 / JENKINS-58625
def failFast = false
-// Same memory sizing for both builds and ATH
-def javaOpts = [
- 'MAVEN_OPTS=-Xmx1536m -Xms512m',
-]
properties([
buildDiscarder(logRotator(numToKeepStr: '50', artifactNumToKeepStr: '3')),
@@ -67,7 +63,7 @@ for (i = 0; i < buildTypes.size(); i++) {
'clean',
'install',
]
- infra.runMaven(mavenOptions, jdk.toString(), javaOpts, null, true)
+ infra.runMaven(mavenOptions, jdk)
if (isUnix()) {
sh 'git add . && git diff --exit-code HEAD'
}
@@ -154,7 +150,7 @@ builds.ath = {
'war',
'package',
]
- infra.runMaven(mavenOptions, '11', javaOpts, null, true)
+ infra.runMaven(mavenOptions, 11)
dir('war/target') {
fileUri = 'file://' + pwd() + '/jenkins.war'
}
