From cd798184545212ea8ab20ee3620906931ad769f1 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 12 Aug 2019 13:37:43 -0500 Subject: [PATCH] Jenkins use openjdk --- Jenkinsfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6c20f09529..96bfd985b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk8' }"]) { sh "./gradlew clean check --refresh-dependencies --no-daemon --stacktrace" } } catch(Exception e) { @@ -34,7 +34,7 @@ try { sh "git clean -dfx" withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) { try { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk8' }"]) { if ("master" == env.BRANCH_NAME) { sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace" } else { @@ -55,7 +55,7 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk8' }"]) { sh "./gradlew clean test -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT --refresh-dependencies --no-daemon --stacktrace" } } catch(Exception e) { @@ -71,7 +71,7 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk9' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk9' }"]) { sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace" } } catch(Exception e) { @@ -87,7 +87,7 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk10' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk10' }"]) { sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace" } } catch(Exception e) { @@ -103,7 +103,7 @@ try { checkout scm sh "git clean -dfx" try { - withEnv(["JAVA_HOME=${ tool 'jdk11' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk11' }"]) { sh "./gradlew clean test --refresh-dependencies --no-daemon --stacktrace" } } catch(Exception e) { @@ -140,7 +140,7 @@ try { withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk8' }"]) { sh "./gradlew deployArtifacts finalizeDeployArtifacts -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password='$SIGNING_PASSWORD' -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --refresh-dependencies --no-daemon --stacktrace" } } @@ -156,7 +156,7 @@ try { checkout scm sh "git clean -dfx" withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk8' }"]) { sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace" } } @@ -169,7 +169,7 @@ try { checkout scm sh "git clean -dfx" withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'openjdk8' }"]) { sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace" } }