From 1dbc5839ce18a21c57acca265d39d51b08597986 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jun 2024 13:43:21 -0700
Subject: [PATCH] Bump org.jenkins-ci:jenkins from 1.115 to 1.116 (#624)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Jenkinsfile | 8 ++++----
 pom.xml     | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1efc3ce96f..853b3897e2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ def runTests(Map params = [:]) {
     if (params['platform'] == 'windows') {
       agentContainerLabel += '-windows'
     }
-    boolean publishing = params['jdk'] == 17 && params['platform'] == 'linux'
+    boolean publishing = params['jdk'] == 21 && params['platform'] == 'linux'
     node(agentContainerLabel) {
       timeout(time: 1, unit: 'HOURS') {
         def stageIdentifier = params['platform'] + '-' + params['jdk']
@@ -40,8 +40,8 @@ def runTests(Map params = [:]) {
 }
 
 parallel(
-    'windows-11': runTests(platform: 'windows', jdk: 11),
-    'linux-17': runTests(platform: 'linux', jdk: 17),
-    'linux-21': runTests(platform: 'linux', jdk: 21)
+    'linux-21': runTests(platform: 'linux', jdk: 21),
+    'windows-17': runTests(platform: 'windows', jdk: 17),
+    'linux-11': runTests(platform: 'linux', jdk: 11)
 )
 infra.maybePublishIncrementals()
diff --git a/pom.xml b/pom.xml
index ad8e5203ef..1f82250864 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.115</version>
+    <version>1.116</version>
     <relativePath />
   </parent>
 
@@ -46,6 +46,8 @@
     <gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
     <!-- if we update this all consumers need to be running at least this version -->
     <maven.version>3.8.1</maven.version>
+    <!-- TODO until a critical mass of plugins has migrated to Java 17 -->
+    <maven.compiler.release>11</maven.compiler.release>
     <maven-plugin-tools.version>3.13.1</maven-plugin-tools.version>
     <spotless.check.skip>false</spotless.check.skip>
   </properties>