Update Jenkins to JDK 17

jzheaux · jzheaux · commit 1632a845d505 · 2022-01-13T16:42:11.000-07:00
Issue gh-611
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -19,7 +19,7 @@ try {
 				sh "git clean -dfx"
 				try {
 					withCredentials([ARTIFACTORY_CREDENTIALS]) {
-						withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
+						withEnv(["JAVA_HOME=${ tool 'openjdk17' }"]) {
 							sh "./gradlew test -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --refresh-dependencies --no-daemon --stacktrace"
 						}
 					}
@@ -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 'openjdk17' }"]) {
 											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 'openjdk17' }"]) {
 								sh "./gradlew deployDocs -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -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 'openjdk17' }"]) {
 								sh "./gradlew deploySchema -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
 							}
 						}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ try {`
`19`	`19`	`sh "git clean -dfx"`
`20`	`20`	`try {`
`21`	`21`	`withCredentials([ARTIFACTORY_CREDENTIALS]) {`
`22`		`- withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {`
	`22`	`+ withEnv(["JAVA_HOME=${ tool 'openjdk17' }"]) {`
`23`	`23`	`sh "./gradlew test -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD --refresh-dependencies --no-daemon --stacktrace"`
`24`	`24`	`}`
`25`	`25`	`}`
`@@ -44,7 +44,7 @@ try {`
`44`	`44`	`withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {`
`45`	`45`	`withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {`
`46`	`46`	`withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {`
`47`		`- withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {`
	`47`	`+ withEnv(["JAVA_HOME=${ tool 'openjdk17' }"]) {`
`48`	`48`	`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"`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -62,7 +62,7 @@ try {`
`62`	`62`	`sh "git clean -dfx"`
`63`	`63`	`withCredentials([ARTIFACTORY_CREDENTIALS]) {`
`64`	`64`	`withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {`
`65`		`- withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {`
	`65`	`+ withEnv(["JAVA_HOME=${ tool 'openjdk17' }"]) {`
`66`	`66`	`sh "./gradlew deployDocs -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"`
`67`	`67`	`}`
`68`	`68`	`}`
`@@ -77,7 +77,7 @@ try {`
`77`	`77`	`sh "git clean -dfx"`
`78`	`78`	`withCredentials([ARTIFACTORY_CREDENTIALS]) {`
`79`	`79`	`withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {`
`80`		`- withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {`
	`80`	`+ withEnv(["JAVA_HOME=${ tool 'openjdk17' }"]) {`
`81`	`81`	`sh "./gradlew deploySchema -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"`
`82`	`82`	`}`
`83`	`83`	`}`