From c5210ceb6346e8bc2995181b3b46555d924fa64a Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 24 Jun 2025 21:33:47 +0200 Subject: [PATCH 1/2] feat(java): Require Jenkins core 2.492.3 and Java 17 --- pom.xml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 6115111..1704398 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.42 + 5.17 io.jenkins.plugins @@ -18,29 +18,21 @@ 4.0.13-2 -SNAPSHOT - 2.332 - ${jenkins.baseline}.4 - 11 + + 2.492 + ${jenkins.baseline}.3 jenkinsci/${project.artifactId}-plugin 4.0.13 3.6.0-4 - - - Simon Symhoven - simonsymhoven - post@simon-symhoven.de - - - io.jenkins.tools.bom bom-${jenkins.baseline}.x - 1478.v81d3dc4f9a_43 + 4948.vcf1d17350668 pom import @@ -117,7 +109,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} From d50bf2b9b2331942f042e1c0f336997dec1b415e Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Tue, 24 Jun 2025 21:41:52 +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], +])