diff --git a/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy b/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy index 8f70162962..ebd0dc8500 100644 --- a/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy +++ b/jenkins/Hono-Deploy-Eclipse-Pipeline-Declarative.groovy @@ -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 diff --git a/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy b/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy index 7c4833995d..2c0d085f49 100644 --- a/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy +++ b/jenkins/Hono-Deploy-Maven-Central-Pipeline-Declarative.groovy @@ -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 diff --git a/jenkins/Hono-PipelineUtils.groovy b/jenkins/Hono-PipelineUtils.groovy index 86d4c043f0..ad945b3969 100644 --- a/jenkins/Hono-PipelineUtils.groovy +++ b/jenkins/Hono-PipelineUtils.groovy @@ -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. @@ -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" } /** @@ -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" } /**