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
-2.332.4
+2.361.4
```
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
io.jenkins.tools.bom
- bom-2.332.x
+ bom-2.361.x
…
import
pom
@@ -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 @@
-
-
- 4.0.0
-
- io.jenkins.tools.bom
- parent
- ${changelist}
-
- bom-2.332.x
- pom
-
- 1.7.5
- 4.12.1
-
-
-
-
- ${project.groupId}
- bom-2.346.x
- ${project.version}
- pom
- import
-
-
- io.jenkins.plugins
- bootstrap5-api
- 5.2.0-1
-
-
- io.jenkins.plugins
- checks-api
- ${checks-api.version}
-
-
- io.jenkins.plugins
- checks-api
- ${checks-api.version}
- tests
-
-
- io.jenkins.plugins
- dark-theme
- 156.v6cf16af6f9ef
-
-
- io.jenkins.plugins
- data-tables-api
- 1.12.1-3
-
-
- io.jenkins.plugins
- data-tables-api
- 1.12.1-3
- tests
-
-
- io.jenkins.plugins
- echarts-api
- 5.3.3-1
-
-
- io.jenkins.plugins
- font-awesome-api
- 6.1.2-1
-
-
- io.jenkins.plugins
- forensics-api
- 1.15.1
-
-
- io.jenkins.plugins
- forensics-api
- tests
- 1.15.1
-
-
- org.jenkins-ci.plugins
- git
- ${git-plugin.version}
-
-
- org.jenkins-ci.plugins
- git
- ${git-plugin.version}
- tests
-
-
- org.jenkins-ci.plugins
- git-client
- 3.12.4
-
-
- org.jenkins-ci.plugins
- gitlab-plugin
- 1.5.36
-
-
- io.jenkins.plugins
- jquery3-api
- 3.6.1-1
-
-
- io.jenkins.plugins
- jnr-posix-api
- 3.1.7-3
-
-
- org.jenkins-ci.plugins
- junit
- 1119.1122.v750e65d31b_db_
-
-
- io.jenkins.plugins
- pipeline-groovy-lib
- 612.v84da_9c54906d
-
-
- io.jenkins.plugins
- plugin-util-api
- 2.17.0
-
-
- io.jenkins.plugins
- plugin-util-api
- 2.17.0
- tests
-
-
- io.jenkins.plugins
- popper2-api
- 2.11.6-1
-
-
- io.jenkins.plugins
- theme-manager
- 0.6
-
-
- org.jenkins-ci.plugins
- config-file-provider
- 3.10.0
-
-
- org.jenkins-ci.plugins
- credentials
- 1087.1089.v2f1b_9a_b_040e4
-
-
- org.jenkins-ci.plugins
- ldap
- 2.11
-
-
- org.jenkins-ci.plugins
- metrics
- 4.1.6.2
-
-
- org.jenkins-ci.plugins
- pipeline-stage-step
- 293.v200037eefcd5
-
-
- org.jenkins-ci.plugins
- script-security
- 1183.v774b_0b_0a_a_451
-
-
- org.jenkins-ci.plugins
- ssh-credentials
- 277.280.v1e86b_7d0056b_
-
-
- org.jenkins-ci.plugins
- ssh-slaves
- 1.821.vd834f8a_c390e
-
-
- org.jenkins-ci.plugins.workflow
- workflow-cps
- 2729.vea_17b_79ed57a_
-
-
- org.jenkins-ci.plugins.workflow
- workflow-cps
- 2729.vea_17b_79ed57a_
- tests
-
-
- org.jenkins-ci.plugins.workflow
- workflow-durable-task-step
- 1190.vc93d7d457042
-
-
- org.jenkins-ci.plugins.workflow
- workflow-job
- 1189.va_d37a_e9e4eda_
-
-
- org.jenkins-ci.plugins.workflow
- workflow-job
- 1189.va_d37a_e9e4eda_
- tests
-
-
-
-
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 @@
-
-
- 4.0.0
-
- io.jenkins.tools.bom
- parent
- ${changelist}
-
- bom-2.346.x
- pom
-
- 4.14.3
- 3536.vb_8a_6628079d5
-
-
-
-
- ${project.groupId}
- bom-2.361.x
- ${project.version}
- pom
- import
-
-
- io.jenkins.plugins
- custom-folder-icon
- 1.12
-
-
- io.jenkins.plugins
- jersey2-api
- 2.37-1
-
-
- org.6wind.jenkins
- lockable-resources
- 2.18
-
-
- org.jenkins-ci.plugins
- cloudbees-folder
- 6.740.ve4f4ffa_dea_54
-
-
- org.jenkins-ci.plugins
- credentials
- 1143.vb_e8b_b_ceee347
-
-
- org.jenkins-ci.plugins
- display-url-api
- 2.3.6
-
-
- org.jenkins-ci.plugins
- email-ext
- 2.92
-
-
- org.jenkins-ci.plugins
- git
- ${git-plugin.version}
-
-
- org.jenkins-ci.plugins
- git
- ${git-plugin.version}
- tests
-
-
- org.jenkins-ci.plugins
- git-client
- 3.13.1
-
-
- org.jenkins-ci.plugins
- git-server
- 1.11
-
-
- org.jenkins-ci.modules
- sshd
- 3.242.va_db_9da_b_26a_c3
-
-
- org.jenkins-ci.plugins
- mailer
- 435.438.v5b_81173f5b_a_1
-
-
- org.jenkins-ci.plugins
- matrix-project
- 772.v494f19991984
-
-
- org.jenkins-ci.plugins
- saml
- 2.333.vc81e525974a_c
-
-
- org.jenkins-ci.plugins
- ssh-slaves
- 1.834.v622da_57f702c
-
-
- org.jenkins-ci.plugins
- text-finder
- 1.21
-
-
- org.jenkins-ci.plugins
- trilead-api
- 1.67.vc3938a_35172f
-
-
- org.jenkins-ci.plugins.workflow
- workflow-job
- 1207.ve6191ff089f8
-
-
- org.jenkins-ci.plugins
- ws-cleanup
- 0.43
-
-
- org.jenkins-ci.plugins.workflow
- workflow-cps
- ${workflow-cps-plugin.version}
-
-
- org.jenkins-ci.plugins.workflow
- workflow-cps
- ${workflow-cps-plugin.version}
- tests
-
-
- org.jenkins-ci.plugins.workflow
- workflow-job
- 1207.ve6191ff089f8
- tests
-
-
-
-
diff --git a/pom.xml b/pom.xml
index 19383f842..632e55aa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,6 @@
bom-weekly
bom-2.375.x
bom-2.361.x
- bom-2.346.x
- bom-2.332.x
sample-plugin
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 @@
2.361.4
-
- 2.346.x
-
- 2.346.x
- 2.346.3
- 3.36
-
-
-
- 2.332.x
-
- 2.332.x
- 2.332.4
- 3.36
-
-