Skip to content

Commit 700ad02

Browse files
committed
Adding JAVA_HOME for JDK 8
Fixes: gh-6928
1 parent be651d9 commit 700ad02

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

Jenkinsfile

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ try {
1414
node {
1515
checkout scm
1616
try {
17-
sh "./gradlew clean check --refresh-dependencies --no-daemon --stacktrace"
17+
withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
18+
sh "./gradlew clean check --refresh-dependencies --no-daemon --stacktrace"
19+
}
1820
} catch(Exception e) {
1921
currentBuild.result = 'FAILED: check'
2022
throw e
@@ -30,10 +32,12 @@ try {
3032
checkout scm
3133
withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) {
3234
try {
33-
if ("master" == env.BRANCH_NAME) {
34-
sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
35-
} else {
36-
sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.projectKey='spring-security-${env.BRANCH_NAME}' -Dsonar.projectName='spring-security-${env.BRANCH_NAME}' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
35+
withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
36+
if ("master" == env.BRANCH_NAME) {
37+
sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
38+
} else {
39+
sh "./gradlew sonarqube -PexcludeProjects='**/samples/**' -Dsonar.projectKey='spring-security-${env.BRANCH_NAME}' -Dsonar.projectName='spring-security-${env.BRANCH_NAME}' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon --stacktrace"
40+
}
3741
}
3842
} catch(Exception e) {
3943
currentBuild.result = 'FAILED: sonar'
@@ -48,7 +52,9 @@ try {
4852
node {
4953
checkout scm
5054
try {
51-
sh "./gradlew clean test -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT --refresh-dependencies --no-daemon --stacktrace"
55+
withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
56+
sh "./gradlew clean test -PforceMavenRepositories=snapshot -PspringVersion='5.+' -PreactorVersion=Dysprosium-BUILD-SNAPSHOT -PspringDataVersion=Lovelace-BUILD-SNAPSHOT --refresh-dependencies --no-daemon --stacktrace"
57+
}
5258
} catch(Exception e) {
5359
currentBuild.result = 'FAILED: snapshots'
5460
throw e
@@ -126,7 +132,9 @@ try {
126132
withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
127133
withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
128134
withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
129-
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"
135+
withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
136+
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"
137+
}
130138
}
131139
}
132140
}
@@ -139,7 +147,9 @@ try {
139147
node {
140148
checkout scm
141149
withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
142-
sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
150+
withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
151+
sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
152+
}
143153
}
144154
}
145155
}
@@ -149,7 +159,9 @@ try {
149159
node {
150160
checkout scm
151161
withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
152-
sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
162+
withEnv(["JAVA_HOME=${ tool 'jdk8' }"]) {
163+
sh "./gradlew deploySchema -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
164+
}
153165
}
154166
}
155167
}

0 commit comments

Comments
 (0)