Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up references to default JDK in Jenkinsfile

This commit is contained in:
Yoann Rodière 2022-10-11 14:49:17 +02:00 committed by Christian Beikov
parent 89ae1dd0e4
commit 6eba1efb83
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jenkinsfile vendored
View File

@ -24,7 +24,6 @@ import org.hibernate.jenkins.pipeline.helpers.job.JobHelper
this.helper = new JobHelper(this)
helper.runWithNotification {
def defaultJdk = '11'
stage('Configure') {
this.environments = [
// new BuildEnvironment( dbName: 'h2' ),
@ -59,7 +58,7 @@ stage('Configure') {
file 'job-configuration.yaml'
// We don't require the following, but the build helper plugin apparently does
jdk {
defaultTool "OpenJDK ${defaultJdk} Latest"
defaultTool DEFAULT_JDK_TOOL
}
maven {
defaultTool 'Apache Maven 3.8'
@ -98,7 +97,7 @@ stage('Build') {
if ( buildEnv.testJdkVersion ) {
testJavaHome = tool(name: "OpenJDK ${buildEnv.testJdkVersion} Latest", type: 'jdk')
}
def javaHome = tool(name: "OpenJDK ${DEFAULT_JDK_VERSION} Latest", type: 'jdk')
def javaHome = tool(name: DEFAULT_JDK_TOOL, type: 'jdk')
// Use withEnv instead of setting env directly, as that is global!
// See https://github.com/jenkinsci/pipeline-plugin/blob/master/TUTORIAL.md
withEnv(["JAVA_HOME=${javaHome}", "PATH+JAVA=${javaHome}/bin"]) {