This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 69b4d8b fix jdk name
69b4d8b is described below
commit 69b4d8beca66f9ad344e9008c82f1b2a8a4b0928
Author: Olivier Lamy <[email protected]>
AuthorDate: Sun Aug 21 21:14:18 2022 +1000
fix jdk name
---
vars/asfMavenTlpPlgnBuild.groovy | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vars/asfMavenTlpPlgnBuild.groovy b/vars/asfMavenTlpPlgnBuild.groovy
index 90e5c52..c4c754a 100644
--- a/vars/asfMavenTlpPlgnBuild.groovy
+++ b/vars/asfMavenTlpPlgnBuild.groovy
@@ -199,10 +199,11 @@ def doCreateTask( os, jdk, maven, tasks, first, plan,
taskContext )
} else try {
def localRepo = "../.maven_repositories/${env.EXECUTOR_NUMBER}"
println "Local Repo (${stageId}): ${localRepo}"
+ println "Jdk $jdkName, mvnName $mvnName"
cmd += "
-Dmaven.repo.local=../.maven_repositories/${env.EXECUTOR_NUMBER}"
cmd += " -Dinvoker.writeJunitReport=true"
withEnv(["JAVA_HOME=${ tool "$jdkName" }",
- "PATH+MAVEN=${ tool "$jdk" }/bin:${tool "$mvnName"}/bin",
+ "PATH+MAVEN=${ tool "$jdkName" }/bin:${tool "$mvnName"}/bin",
"MAVEN_OPTS=-Xms2g -Xmx4g -Djava.awt.headless=true"]) {
dir (stageDir) {
if (isUnix()) {