From bf989cab6a3860b2f075ee0fb3d6304e2e55fb96 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 3 Oct 2023 10:35:29 +0200 Subject: [PATCH 1/6] Add a JDK21 Jenkinsfile for ci.jenkins.io --- Jenkinsfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b94810a..64fce02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,12 @@ -buildPlugin(useContainerAgent: true, configurations: [ - [ platform: "linux", jdk: "8" ], - [ platform: "windows", jdk: "8" ], - [ platform: "linux", jdk: "11" ] +/* + See the documentation for more options: + +https://github.com/jenkins-infra/pipeline-library/ + +*/ +buildPlugin( + useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests + configurations: [ + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17], ]) From c63fd816217bd3bc6ad69cf6f05eca3bea74f58d Mon Sep 17 00:00:00 2001 From: gounthar Date: Tue, 3 Oct 2023 10:36:32 +0200 Subject: [PATCH 2/6] fix(maven): Updates parent POM version to allow compatibility with JDK21 General error during conversion: Unsupported class file major version 65 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 525499d..21c570e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.46 + 4.74 org.jenkins-ci.plugins From 34f2be8f0bd7388e1421b7388f9000b4a8b93af3 Mon Sep 17 00:00:00 2001 From: gounthar Date: Tue, 3 Oct 2023 10:37:27 +0200 Subject: [PATCH 3/6] fix(maven): Updates Jenkins version to allow compatibility with JDK21 This version of maven-hpi-plugin requires Jenkins 2.361 or later --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 21c570e..0586c84 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,8 @@ io.jenkins.tools.bom - bom-2.346.x - 1607.va_c1576527071 + bom-2.361.x + 2120.v89a_c54a_1e4f9 import pom From 0a96bca72673c610f9c3d7e44a21d8fce26024d2 Mon Sep 17 00:00:00 2001 From: gounthar Date: Tue, 3 Oct 2023 10:38:13 +0200 Subject: [PATCH 4/6] fix(maven): Updates Jenkins version to allow compatibility with JDK21 This version of maven-hpi-plugin requires Jenkins 2.361 or later --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0586c84..1071c09 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 999999-SNAPSHOT - 2.346.1 + 2.361.4 jenkinsci/${project.artifactId}-plugin From 05e72db174018bc58a9920bfc63368a0637df26e Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Mon, 9 Oct 2023 11:26:36 +0200 Subject: [PATCH 5/6] Update pom.xml Co-authored-by: Mark Waite --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1071c09..70194d9 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ io.jenkins.tools.bom bom-2.361.x - 2120.v89a_c54a_1e4f9 + 2102.v854b_fec19c92 import pom From 51caf9972b9df45af721a03b93e886a789e06b24 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 2 Jan 2024 20:05:50 +0100 Subject: [PATCH 6/6] Most recent parent pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70194d9..25afb6f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.74 + 4.76 org.jenkins-ci.plugins