Skip to content

Commit

Permalink
Use most recent JDK 11
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
sophokles73 committed Jul 21, 2022
1 parent 4165101 commit 2212525
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ kind: Pod
spec:
containers:
- name: maven
image: "maven:3.8-openjdk-11"
image: "maven:3.8.4-openjdk-11"
tty: true
command:
- cat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ kind: Pod
spec:
containers:
- name: maven
image: "maven:3.8-openjdk-11"
image: "maven:3.8.4-openjdk-11"
tty: true
command:
- cat
Expand Down
9 changes: 6 additions & 3 deletions jenkins/Hono-PipelineUtils.groovy
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env groovy

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

/**
Expand All @@ -33,7 +36,7 @@ String getJDKVersion() {
* @return returns the maven version to be used for the build.
*/
String getMavenVersion() {
return "apache-maven-latest"
return "apache-maven-3.8.4"
}

/**
Expand Down

0 comments on commit 2212525

Please sign in to comment.