Skip to content

Commit 2212525

Browse files
committed
Use most recent JDK 11
This is necessary so that the unit tests can successfully read the demo cert keystore created using a recent JDK 11. Signed-off-by: Kai Hudalla <[email protected]>
1 parent 4165101 commit 2212525

3 files changed

+8
-5
lines changed

jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ kind: Pod
2727
spec:
2828
containers:
2929
- name: maven
30-
image: "maven:3.8-openjdk-11"
30+
image: "maven:3.8.4-openjdk-11"
3131
tty: true
3232
command:
3333
- cat

jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ kind: Pod
2727
spec:
2828
containers:
2929
- name: maven
30-
image: "maven:3.8-openjdk-11"
30+
image: "maven:3.8.4-openjdk-11"
3131
tty: true
3232
command:
3333
- cat

jenkins/Hono-PipelineUtils.groovy

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env groovy
22

33
/*******************************************************************************
4-
* Copyright (c) 2016, 2020 Contributors to the Eclipse Foundation
4+
* Copyright (c) 2016, 2022 Contributors to the Eclipse Foundation
55
*
66
* See the NOTICE file(s) distributed with this work for additional
77
* information regarding copyright ownership.
@@ -24,7 +24,10 @@
2424
* @return returns the jdk version to be used for the build.
2525
*/
2626
String getJDKVersion() {
27-
return "openjdk-jdk11-latest"
27+
// we use the Eclipse Temurin JDK here because the latest OpenJDK 11 version available
28+
// on the Eclipse Jenkins infra is 11.0.2+9 which fails to read Java key stores created with
29+
// JDK versions >= 11.0.5
30+
return "temurin-jdk11-latest"
2831
}
2932

3033
/**
@@ -33,7 +36,7 @@ String getJDKVersion() {
3336
* @return returns the maven version to be used for the build.
3437
*/
3538
String getMavenVersion() {
36-
return "apache-maven-latest"
39+
return "apache-maven-3.8.4"
3740
}
3841

3942
/**

0 commit comments

Comments
 (0)