From 3c12dcdd1767f9b18efe8d61d0df1df37532b485 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Wed, 2 Feb 2022 17:03:17 -0700 Subject: [PATCH] Use JDK 11 for Artifacts Issue gh-626 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index efce22dc..d16b6194 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,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 'jdk11' }"]) { sh "./gradlew deployArtifacts finalizeDeployArtifacts -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -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" } } @@ -62,7 +62,7 @@ try { sh "git clean -dfx" withCredentials([ARTIFACTORY_CREDENTIALS]) { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'jdk11' }"]) { sh "./gradlew deployDocs -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsHost=docs-ip.spring.io -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace" } } @@ -77,7 +77,7 @@ try { sh "git clean -dfx" withCredentials([ARTIFACTORY_CREDENTIALS]) { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) { + withEnv(["JAVA_HOME=${ tool 'jdk11' }"]) { sh "./gradlew deploySchema -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsHost=docs-ip.spring.io -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace" } }