From 9ae85780f520fe3a558d42a70b491ec8447d7932 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 13 Jul 2024 05:28:04 -0600
Subject: [PATCH 1/7] Replace 2.426 with 2.440 in documentation

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e3d184013..af4e9f16b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ If you are interested in a Bill of Materials for Jenkins core components, see [t
 After [selecting your plugin’s LTS baseline](https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/):
 
 ```xml
-<jenkins.version>2.426.3</jenkins.version>
+<jenkins.version>2.440.3</jenkins.version>
 ```
 
 just import the [latest BOM](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom) from that line:
@@ -24,7 +24,7 @@ just import the [latest BOM](https://repo.jenkins-ci.org/public/io/jenkins/tools
     <dependencies>
         <dependency>
             <groupId>io.jenkins.tools.bom</groupId>
-            <artifactId>bom-2.426.x</artifactId>
+            <artifactId>bom-2.440.x</artifactId>
             <version>…</version>
             <scope>import</scope>
             <type>pom</type>
@@ -182,7 +182,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh
 optionally also passing either
 
 ```
-LINE=2.426.x
+LINE=2.440.x
 ```
 
 or

From c6c5a9cf8ec868365e6bce55be34a484987585f8 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 13 Jul 2024 05:31:40 -0600
Subject: [PATCH 2/7] Remove 2.426.x line

Remove workflow-cps-plugin workaround

Fixes https://github.com/jenkinsci/bom/issues/3301
---
 bom-2.426.x/pom.xml   | 115 ------------------------------------------
 pct.sh                |  10 ----
 pom.xml               |   1 -
 sample-plugin/pom.xml |   7 ---
 4 files changed, 133 deletions(-)
 delete mode 100644 bom-2.426.x/pom.xml

diff --git a/bom-2.426.x/pom.xml b/bom-2.426.x/pom.xml
deleted file mode 100644
index 96735360f..000000000
--- a/bom-2.426.x/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>io.jenkins.tools.bom</groupId>
-    <artifactId>parent</artifactId>
-    <version>${changelist}</version>
-  </parent>
-  <artifactId>bom-2.426.x</artifactId>
-  <packaging>pom</packaging>
-  <properties>
-    <cloudbees-folder-plugin.version>6.858.v898218f3609d</cloudbees-folder-plugin.version>
-    <subversion-plugin.version>1261.v040121d29c7c</subversion-plugin.version>
-    <workflow-job-plugin.version>1385.vb_58b_86ea_fff1</workflow-job-plugin.version>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>bom-2.440.x</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>io.jenkins.plugins</groupId>
-        <artifactId>markdown-formatter</artifactId>
-        <version>167.v8a_428ca_49f89</version>
-      </dependency>
-      <dependency>
-        <groupId>io.jenkins.plugins</groupId>
-        <artifactId>pipeline-graph-view</artifactId>
-        <version>215.217.v2f6b_05084f10</version>
-      </dependency>
-      <dependency>
-        <groupId>org.6wind.jenkins</groupId>
-        <artifactId>lockable-resources</artifactId>
-        <version>1245.1247.vea_384d871c85</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>cloudbees-folder</artifactId>
-        <version>${cloudbees-folder-plugin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>cloudbees-folder</artifactId>
-        <version>${cloudbees-folder-plugin.version}</version>
-        <classifier>tests</classifier>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>email-ext</artifactId>
-        <version>2.105</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>git-client</artifactId>
-        <version>4.7.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>mailer</artifactId>
-        <version>470.vc91f60c5d8e2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>matrix-project</artifactId>
-        <version>822.824.v14451b_c0fd42</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>pipeline-input-step</artifactId>
-        <version>477.v339683a_8d55e</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>pipeline-utility-steps</artifactId>
-        <version>2.16.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>role-strategy</artifactId>
-        <version>717.v6a_69a_fe98974</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>subversion</artifactId>
-        <version>${subversion-plugin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>subversion</artifactId>
-        <version>${subversion-plugin.version}</version>
-        <classifier>tests</classifier>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins.workflow</groupId>
-        <artifactId>workflow-durable-task-step</artifactId>
-        <version>1331.vc8c2fed35334</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins.workflow</groupId>
-        <artifactId>workflow-job</artifactId>
-        <version>${workflow-job-plugin.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins.workflow</groupId>
-        <artifactId>workflow-job</artifactId>
-        <version>${workflow-job-plugin.version}</version>
-        <classifier>tests</classifier>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>
diff --git a/pct.sh b/pct.sh
index d3bccf0bb..3729dfe02 100755
--- a/pct.sh
+++ b/pct.sh
@@ -20,16 +20,6 @@ if ! [[ $PLUGINS =~ blueocean || $PLUGINS =~ lockable-resources || $PLUGINS =~ p
 	PCT_D_ARGS+='-DforkCount=.75C '
 fi
 
-#
-# jenkinsci/workflow-cps-plugin#877 depends on jenkinsci/jenkins#9012, but only
-# on Java 17 and newer. The 2.426.x line is the only remaining line to which
-# jenkinsci/jenkins#9012 has not been backported. When we drop support for
-# 2.426.x, this should be deleted.
-#
-if [[ $PLUGINS =~ pipeline-groovy-lib && $LINE == 2.426.x ]]; then
-	echo 'org.jenkinsci.plugins.workflow.libs.LibraryMemoryTest#loaderReleased' >>excludes.txt
-fi
-
 exec java \
 	-jar target/pct.jar \
 	test-plugins \
diff --git a/pom.xml b/pom.xml
index a21651ec5..638a9cadd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
     <module>bom-weekly</module>
     <module>bom-2.452.x</module>
     <module>bom-2.440.x</module>
-    <module>bom-2.426.x</module>
     <module>sample-plugin</module>
   </modules>
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index c20943b0d..4dce1dcab 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -1103,12 +1103,5 @@
         <jenkins.version>2.440.3</jenkins.version>
       </properties>
     </profile>
-    <profile>
-      <id>2.426.x</id>
-      <properties>
-        <bom>2.426.x</bom>
-        <jenkins.version>2.426.3</jenkins.version>
-      </properties>
-    </profile>
   </profiles>
 </project>

From 909a3454b498f8a1419a3e0c0b3dfc53aaaf40dd Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 13 Jul 2024 05:32:54 -0600
Subject: [PATCH 3/7] Add 2.462.x release line

---
 bom-2.462.x/pom.xml   | 22 ++++++++++++++++++++++
 pom.xml               |  1 +
 sample-plugin/pom.xml |  8 ++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 bom-2.462.x/pom.xml

diff --git a/bom-2.462.x/pom.xml b/bom-2.462.x/pom.xml
new file mode 100644
index 000000000..4278e7e10
--- /dev/null
+++ b/bom-2.462.x/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.jenkins.tools.bom</groupId>
+    <artifactId>parent</artifactId>
+    <version>${changelist}</version>
+  </parent>
+  <artifactId>bom-2.462.x</artifactId>
+  <packaging>pom</packaging>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>bom-weekly</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+</project>
diff --git a/pom.xml b/pom.xml
index 638a9cadd..cff193aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
   </licenses>
   <modules>
     <module>bom-weekly</module>
+    <module>bom-2.462.x</module>
     <module>bom-2.452.x</module>
     <module>bom-2.440.x</module>
     <module>sample-plugin</module>
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index 4dce1dcab..93185bb41 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -1089,6 +1089,14 @@
   </build>
   <profiles>
     <!-- Use .1 of most recent active line, and .3 (or later) of previous lines: https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/#choosing-a-version -->
+    <profile>
+      <id>2.462.x</id>
+      <properties>
+        <bom>2.462.x</bom>
+        <!-- TODO: Update to 2.462.1 after it is released. -->
+        <jenkins.version>2.462</jenkins.version>
+      </properties>
+    </profile>
     <profile>
       <id>2.452.x</id>
       <properties>

From 5ba061e3025567cc0227facd0e319d29874f8960 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 13 Jul 2024 05:33:11 -0600
Subject: [PATCH 4/7] Use 2.452.3 instead of 2.452.1 as 2.452.x Jenkins version

As recommended by "choosing a Jenkins version" and past practice.
---
 sample-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index 93185bb41..c17714709 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -1101,7 +1101,7 @@
       <id>2.452.x</id>
       <properties>
         <bom>2.452.x</bom>
-        <jenkins.version>2.452.1</jenkins.version>
+        <jenkins.version>2.452.3</jenkins.version>
       </properties>
     </profile>
     <profile>

From 6cce6fe182b63ece19b31235cc3a8020ccc3a018 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 13 Jul 2024 05:36:03 -0600
Subject: [PATCH 5/7] Document the final 2.426.x BOM version

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index af4e9f16b..39bf820da 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,7 @@ When an older Jenkins version is used, then the matching older version of the pl
 | bom-2.387.x | 2543.vfb_1a_5fb_9496d |                              |
 | bom-2.401.x | 2745.vc7b_fe4c876fa_  |                              |
 | bom-2.414.x | 2982.vdce2153031a_0   |                              |
+| bom-2.426.x | 3193.v330d8248d39e    |                              |
 
 The latest versions of all BOM lines are available from the [Jenkins artifact repository](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom).
 

From 99a27d3ae23d7a542db105494ed30aae155bc797 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Mon, 15 Jul 2024 09:51:27 -0600
Subject: [PATCH 6/7] bom-2.452.x must depend on bom-2.462.x

Thanks to @jglick for detecting that mistake.  Reported as
https://github.com/jenkinsci/bom/pull/3374#pullrequestreview-2177691511
---
 bom-2.452.x/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom-2.452.x/pom.xml b/bom-2.452.x/pom.xml
index 27f19a8a3..fbf7f1f6f 100644
--- a/bom-2.452.x/pom.xml
+++ b/bom-2.452.x/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
       <dependency>
         <groupId>${project.groupId}</groupId>
-        <artifactId>bom-weekly</artifactId>
+        <artifactId>bom-2.462.x</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>

From 86f5a5ca51c46f34e007414c1606b98ae2b7a82c Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 25 Jul 2024 09:03:52 -0600
Subject: [PATCH 7/7] Correct the bom-2.426.x final version in README

Easier for me to find those old versions in the README rather than
searching the releases list for comments that tell me when a line was
dropped.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39bf820da..35e8994bf 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ When an older Jenkins version is used, then the matching older version of the pl
 | bom-2.387.x | 2543.vfb_1a_5fb_9496d |                              |
 | bom-2.401.x | 2745.vc7b_fe4c876fa_  |                              |
 | bom-2.414.x | 2982.vdce2153031a_0   |                              |
-| bom-2.426.x | 3193.v330d8248d39e    |                              |
+| bom-2.426.x | 3208.vb_21177d4b_cd9  |                              |
 
 The latest versions of all BOM lines are available from the [Jenkins artifact repository](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom).