From 600d3e8a831f16778b07b1497ee9bd2aceedb74d Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 15 Apr 2025 17:19:43 +0200 Subject: [PATCH 1/2] feat(java): Require Jenkins core 2.479.3 and Java 17 --- pom.xml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index f0fecef..44d21ad 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.33 + 5.11 io.jenkins.plugins @@ -15,9 +15,8 @@ 999999-SNAPSHOT - 2.263 - ${jenkins.baseline}.1 - 8 + 2.479 + ${jenkins.baseline}.3 jenkinsci/${project.artifactId}-plugin 4.3 @@ -29,7 +28,7 @@ io.jenkins.tools.bom bom-${jenkins.baseline}.x - 961.vf0c9f6f59827 + 4607.v67a_4791074d7 import pom @@ -40,7 +39,6 @@ org.jenkins-ci.plugins git - 4.8.1 org.jenkins-ci.plugins @@ -73,7 +71,7 @@ - scm:git:git://github.com/${gitHubRepo}.git + scm:git:https://github.com/${gitHubRepo}.git scm:git:git@github.com:${gitHubRepo}.git https://github.com/${gitHubRepo} ${scmTag} @@ -118,12 +116,4 @@ - - - - reda-alaoui - Réda Housni Alaoui - reda-alaoui@hey.com - - From c7565a478a554baee956963e707ce9c5bfd81d0d Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 15 Apr 2025 17:20:21 +0200 Subject: [PATCH 2/2] chore(jenkins): Build with JDK17 and 21. --- Jenkinsfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 18218b7..b3312ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,11 @@ /* - See the documentation for more options: - https://github.com/jenkins-infra/pipeline-library/ -*/ -buildPlugin(useContainerAgent: true) + * See the documentation for more options: + * https://github.com/jenkins-infra/pipeline-library/ + */ +buildPlugin( + forkCount: '1C', // run this number of tests in parallel for faster feedback. If the number terminates with a 'C', the value will be multiplied by the number of available CPU cores + useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests + configurations: [ + [platform: 'linux', jdk: 21], + [platform: 'windows', jdk: 17], +])