From 0bf2af7d0b1d7ccb3121b83b3ee5d3270e4faec3 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 3 Jan 2023 19:07:21 -0500
Subject: [PATCH] Dropping 2.332.x & 2.346.x (#1668)

* Dropping 2.332.x & 2.346.x

* Adjusting docs about retiring lines
---
 .github/dependabot.yml     |   3 -
 README.md                  |   7 +-
 bom-2.332.x/pom.xml        | 208 -------------------------------------
 bom-2.346.x/pom.xml        | 144 -------------------------
 pom.xml                    |   2 -
 sample-plugin/check.groovy |   3 +-
 sample-plugin/pom.xml      |  16 ---
 7 files changed, 5 insertions(+), 378 deletions(-)
 delete mode 100644 bom-2.332.x/pom.xml
 delete mode 100644 bom-2.346.x/pom.xml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f129d54e2..7d2f39a67 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,9 +7,6 @@ updates:
       - "jglick"
     schedule:
       interval: "daily"
-    ignore:
-      # TODO until 2.332.x & 2.346.x dropped
-      - dependency-name: org.jenkins-ci.plugins:plugin
   - package-ecosystem: "maven"
     open-pull-requests-limit: 25
     directory: "/bom-weekly"
diff --git a/README.md b/README.md
index 9afbe6ef5..0ec1c4ff1 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:
 
 ```xml
-<jenkins.version>2.332.4</jenkins.version>
+<jenkins.version>2.361.4</jenkins.version>
 ```
 
 just import the [latest BOM](https://github.com/jenkinsci/bom/releases) from that line:
@@ -24,7 +24,7 @@ just import the [latest BOM](https://github.com/jenkinsci/bom/releases) from tha
     <dependencies>
         <dependency>
             <groupId>io.jenkins.tools.bom</groupId>
-            <artifactId>bom-2.332.x</artifactId>
+            <artifactId>bom-2.361.x</artifactId>
             <version>…</version>
             <scope>import</scope>
             <type>pom</type>
@@ -184,7 +184,8 @@ The CI build (or just `mvn test -P2.nnn.x`) will fail if some managed plugins ar
 is a handy way to find the most recently released plugin version compatible with a given line,
 according to the `jenkins-infra/update-center2`.
 The UC currently maintains releases for the [past 400 days](https://groups.google.com/g/jenkins-infra/c/LTrRUqkgeQA/m/UmQMD5gDAgAJ)
-so it is reasonable to retire BOMs for lines older than that.
+so it is reasonable to retire BOMs for lines older than that,
+or otherwise when the number of accumulated version overrides becomes large.
 
 Add the label `full-test` in dangerous-looking PRs to make sure you are running tests in all LTS lines;
 by default tests are only run in the oldest line and weeklies.
diff --git a/bom-2.332.x/pom.xml b/bom-2.332.x/pom.xml
deleted file mode 100644
index 99b78a337..000000000
--- a/bom-2.332.x/pom.xml
+++ /dev/null
@@ -1,208 +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.332.x</artifactId>
-    <packaging>pom</packaging>
-    <properties>
-        <checks-api.version>1.7.5</checks-api.version>
-        <git-plugin.version>4.12.1</git-plugin.version>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bom-2.346.x</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>bootstrap5-api</artifactId>
-                <version>5.2.0-1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>checks-api</artifactId>
-                <version>${checks-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>checks-api</artifactId>
-                <version>${checks-api.version}</version>
-                <classifier>tests</classifier>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>dark-theme</artifactId>
-                <version>156.v6cf16af6f9ef</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>data-tables-api</artifactId>
-                <version>1.12.1-3</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>data-tables-api</artifactId>
-                <version>1.12.1-3</version>
-                <classifier>tests</classifier>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>echarts-api</artifactId>
-                <version>5.3.3-1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>font-awesome-api</artifactId>
-                <version>6.1.2-1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>forensics-api</artifactId>
-                <version>1.15.1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>forensics-api</artifactId>
-                <classifier>tests</classifier>
-                <version>1.15.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>git</artifactId>
-                <version>${git-plugin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>git</artifactId>
-                <version>${git-plugin.version}</version>
-                <classifier>tests</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>git-client</artifactId>
-                <version>3.12.4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>gitlab-plugin</artifactId>
-                <version>1.5.36</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>jquery3-api</artifactId>
-                <version>3.6.1-1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>jnr-posix-api</artifactId>
-                <version>3.1.7-3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>junit</artifactId>
-                <version>1119.1122.v750e65d31b_db_</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>pipeline-groovy-lib</artifactId>
-                <version>612.v84da_9c54906d</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>plugin-util-api</artifactId>
-                <version>2.17.0</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>plugin-util-api</artifactId>
-                <version>2.17.0</version>
-                <classifier>tests</classifier>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>popper2-api</artifactId>
-                <version>2.11.6-1</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>theme-manager</artifactId>
-                <version>0.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>config-file-provider</artifactId>
-                <version>3.10.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>credentials</artifactId>
-                <version>1087.1089.v2f1b_9a_b_040e4</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>ldap</artifactId>
-                <version>2.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>metrics</artifactId>
-                <version>4.1.6.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>pipeline-stage-step</artifactId>
-                <version>293.v200037eefcd5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>script-security</artifactId>
-                <version>1183.v774b_0b_0a_a_451</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>ssh-credentials</artifactId>
-                <version>277.280.v1e86b_7d0056b_</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>ssh-slaves</artifactId>
-                <version>1.821.vd834f8a_c390e</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-cps</artifactId>
-                <version>2729.vea_17b_79ed57a_</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-cps</artifactId>
-                <version>2729.vea_17b_79ed57a_</version>
-                <classifier>tests</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-durable-task-step</artifactId>
-                <version>1190.vc93d7d457042</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-job</artifactId>
-                <version>1189.va_d37a_e9e4eda_</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-job</artifactId>
-                <version>1189.va_d37a_e9e4eda_</version>
-                <classifier>tests</classifier>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/bom-2.346.x/pom.xml b/bom-2.346.x/pom.xml
deleted file mode 100644
index 4dcb8026d..000000000
--- a/bom-2.346.x/pom.xml
+++ /dev/null
@@ -1,144 +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.346.x</artifactId>
-    <packaging>pom</packaging>
-    <properties>
-        <git-plugin.version>4.14.3</git-plugin.version>
-        <workflow-cps-plugin.version>3536.vb_8a_6628079d5</workflow-cps-plugin.version>
-    </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>bom-2.361.x</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>custom-folder-icon</artifactId>
-                <version>1.12</version>
-            </dependency>
-            <dependency>
-                <groupId>io.jenkins.plugins</groupId>
-                <artifactId>jersey2-api</artifactId>
-                <version>2.37-1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.6wind.jenkins</groupId>
-                <artifactId>lockable-resources</artifactId>
-                <version>2.18</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>cloudbees-folder</artifactId>
-                <version>6.740.ve4f4ffa_dea_54</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>credentials</artifactId>
-                <version>1143.vb_e8b_b_ceee347</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>display-url-api</artifactId>
-                <version>2.3.6</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>email-ext</artifactId>
-                <version>2.92</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>git</artifactId>
-                <version>${git-plugin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>git</artifactId>
-                <version>${git-plugin.version}</version>
-                <classifier>tests</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>git-client</artifactId>
-                <version>3.13.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>git-server</artifactId>
-                <version>1.11</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.modules</groupId>
-                <artifactId>sshd</artifactId>
-                <version>3.242.va_db_9da_b_26a_c3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>mailer</artifactId>
-                <version>435.438.v5b_81173f5b_a_1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>matrix-project</artifactId>
-                <version>772.v494f19991984</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>saml</artifactId>
-                <version>2.333.vc81e525974a_c</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>ssh-slaves</artifactId>
-                <version>1.834.v622da_57f702c</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>text-finder</artifactId>
-                <version>1.21</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>trilead-api</artifactId>
-                <version>1.67.vc3938a_35172f</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-job</artifactId>
-                <version>1207.ve6191ff089f8</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>ws-cleanup</artifactId>
-                <version>0.43</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-cps</artifactId>
-                <version>${workflow-cps-plugin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-cps</artifactId>
-                <version>${workflow-cps-plugin.version}</version>
-                <classifier>tests</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins.workflow</groupId>
-                <artifactId>workflow-job</artifactId>
-                <version>1207.ve6191ff089f8</version>
-                <classifier>tests</classifier>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
diff --git a/pom.xml b/pom.xml
index 19383f842..632e55aa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,6 @@
         <module>bom-weekly</module>
         <module>bom-2.375.x</module>
         <module>bom-2.361.x</module>
-        <module>bom-2.346.x</module>
-        <module>bom-2.332.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/check.groovy b/sample-plugin/check.groovy
index a871a0087..004514799 100644
--- a/sample-plugin/check.groovy
+++ b/sample-plugin/check.groovy
@@ -7,8 +7,7 @@ assert artifactMap['junit:junit'] == project.artifactMap['junit:junit']
 def managedPluginDeps = managedDeps.collect {stripAllButGA(it)}.grep { ga ->
     def art = artifactMap[ga]
     if (art == null) {
-        if (ga.contains('.plugins') // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
-                && !(ga == 'io.jenkins.plugins:ionicons-api' && settings.activeProfiles.any {it ==~ /^2[.](332)[.]x$/})) { // TODO: Remove once 2.332.x is no longer part of the BOM (or if MNG-5600 is fixed and we can exclude this dependency in the BOM for old LTS lines)
+        if (ga.contains('.plugins')) { // TODO without an Artifact, we have no reliable way of checking whether it is actually a plugin
             throw new org.apache.maven.plugin.MojoFailureException("Managed plugin dependency $ga not listed in test classpath of sample plugin")
         } else {
             println "Do not see managed dependency $ga"
diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml
index 21e4695d9..6b1e06a78 100644
--- a/sample-plugin/pom.xml
+++ b/sample-plugin/pom.xml
@@ -574,21 +574,5 @@
                 <jenkins.version>2.361.4</jenkins.version>
             </properties>
         </profile>
-        <profile>
-            <id>2.346.x</id>
-            <properties>
-                <bom>2.346.x</bom>
-                <jenkins.version>2.346.3</jenkins.version>
-                <hpi-plugin.version>3.36</hpi-plugin.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>2.332.x</id>
-            <properties>
-                <bom>2.332.x</bom>
-                <jenkins.version>2.332.4</jenkins.version>
-                <hpi-plugin.version>3.36</hpi-plugin.version>
-            </properties>
-        </profile>
     </profiles>
 </project>