diff --git a/Jenkinsfile b/Jenkinsfile index 46d3a62f1d8..4354ff9c074 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,9 +25,9 @@ pipeline { } tools { - // the Java version we use to run the build (minimal requirement for Maven/Tycho) - // we force other Java versions through Maven toolchains - jdk "temurin-jdk17-latest" + // the Java version we use to run the build + // we force the effective JDK version for compilation/testing through Maven toolchains + jdk "temurin-jdk21-latest" } stages { @@ -68,6 +68,7 @@ pipeline { sh """ ./full-build.sh --tp=${selectedTargetPlatform()} \ ${javaVersion() == 11 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-11' : ''} \ + ${javaVersion() == 17 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-17' : ''} \ ${javaVersion() == 21 ? '-Pstrict-jdk-21' : ''} """ } diff --git a/pom.xml b/pom.xml index 04f8b31934b..a3d4be6af61 100644 --- a/pom.xml +++ b/pom.xml @@ -445,8 +445,37 @@ + + strict-jdk-17 + + + + org.apache.maven.plugins + maven-toolchains-plugin + + + + toolchain + + + + + + + + 17 + + + + + + + strict-jdk-21 +