From 4f3508acb96c80ceb63849c01d0446ae65eebb3c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 03:22:42 +0000 Subject: [PATCH 1/3] Bump org.jenkins-ci:jenkins from 1.115 to 1.116 Bumps [org.jenkins-ci:jenkins](https://github.com/jenkinsci/pom) from 1.115 to 1.116. - [Release notes](https://github.com/jenkinsci/pom/releases) - [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG-old.md) - [Commits](https://github.com/jenkinsci/pom/compare/jenkins-1.115...jenkins-1.116) --- updated-dependencies: - dependency-name: org.jenkins-ci:jenkins dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 09ef7f2f8..801050d84 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci jenkins - 1.115 + 1.116 From de08a6cdaf473f678c0303b50ccccab005c6068e Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 10 Jun 2024 13:09:51 -0700 Subject: [PATCH 2/3] Downgrade to Java 11 --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 801050d84..c184fc244 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,8 @@ THE SOFTWARE. jenkinsci/${project.artifactId} --patch-module=java.base=${project.build.outputDirectory}/netbeans/harness/modules/ext/org-netbeans-insane-hook.jar --add-exports=java.base/org.netbeans.insane.hook=ALL-UNNAMED + + 11 From 3c5adbb0fa3416de465c89819aeaa99ec831f764 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 10 Jun 2024 13:10:48 -0700 Subject: [PATCH 3/3] Format `Jenkinsfile` --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0d5a8f53e..9631d1d91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ * allowing one to test against multiple Jenkins versions. */ buildPlugin(useContainerAgent: true, configurations: [ - [ platform: 'linux', jdk: '11' ], - [ platform: 'windows', jdk: '11' ], - [ platform: 'linux', jdk: '17', jenkins: '2.461' ], + [platform: 'linux', jdk: 11], + [platform: 'windows', jdk: 11], + [platform: 'linux', jdk: 17, jenkins: '2.461'], ])