From 17ffc46ff8dcc51b3b6bf5b3b869e7eb05ad16af Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:21:06 +0000
Subject: [PATCH 1/3] [SECURITY-3463]

---
 bom/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index bf498077c163..9413a5957ef0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -39,7 +39,7 @@ THE SOFTWARE.
 
   <properties>
     <commons-fileupload2.version>2.0.0-M2</commons-fileupload2.version>
-    <stapler.version>1927.vca_a_9061b_2f28</stapler.version>
+    <stapler.version>1928.v9115fe47607f</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 
@@ -335,7 +335,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.kohsuke.stapler</groupId>
         <artifactId>json-lib</artifactId>
-        <version>2.4-jenkins-7</version>
+        <version>2.4-jenkins-8</version>
       </dependency>
       <dependency>
         <groupId>org.kohsuke.stapler</groupId>

From 37069bd17d167e292915e2308ea6cf39c8e16c00 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:14:51 +0000
Subject: [PATCH 2/3] [maven-release-plugin] prepare release jenkins-2.487

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 6 +++---
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 9413a5957ef0..a8c15eadf1f7 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 2473629d23cc..c3ad0273593a 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 9bff5e5ad0b2..f7eea7349dfa 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..f17cf2b79189 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index b8c1adb1f89f..6500cdf0130f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.487</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.487</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -75,7 +75,7 @@ THE SOFTWARE.
   <properties>
     <revision>2.487</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-11-19T13:49:45Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-11-25T15:52:13Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index b7885dcd142e..5151a2049ed5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 43af909f06e2..27633f8fd1d1 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index 2253163b3c4c..df8d2f941429 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 178413f92c8e..43ec40b62144 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.487</version>
     <relativePath>../..</relativePath>
   </parent>
 

From d092094d686bd6282025313b1df9e70e79876673 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Mon, 25 Nov 2024 19:15:28 +0000
Subject: [PATCH 3/3] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml                   | 2 +-
 cli/pom.xml                   | 2 +-
 core/pom.xml                  | 2 +-
 coverage/pom.xml              | 2 +-
 pom.xml                       | 8 ++++----
 test/pom.xml                  | 2 +-
 war/pom.xml                   | 2 +-
 websocket/jetty12-ee9/pom.xml | 2 +-
 websocket/spi/pom.xml         | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index a8c15eadf1f7..9413a5957ef0 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index c3ad0273593a..2473629d23cc 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index f7eea7349dfa..9bff5e5ad0b2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index f17cf2b79189..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 6500cdf0130f..5aaf52a73603 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.487</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -63,7 +63,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.487</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -73,9 +73,9 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.487</revision>
+    <revision>2.488</revision>
     <changelist>-SNAPSHOT</changelist>
-    <project.build.outputTimestamp>2024-11-25T15:52:13Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2024-11-25T19:14:52Z</project.build.outputTimestamp>
 
     <!-- configuration for patch tracker plugin  -->
     <project.patchManagement.system>github</project.patchManagement.system>
diff --git a/test/pom.xml b/test/pom.xml
index 5151a2049ed5..b7885dcd142e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 27633f8fd1d1..43af909f06e2 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index df8d2f941429..2253163b3c4c 100644
--- a/websocket/jetty12-ee9/pom.xml
+++ b/websocket/jetty12-ee9/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>
 
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 43ec40b62144..178413f92c8e 100644
--- a/websocket/spi/pom.xml
+++ b/websocket/spi/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.487</version>
+    <version>${revision}${changelist}</version>
     <relativePath>../..</relativePath>
   </parent>