From 64bf1c6382e1fbf4e5f98c28025ce8bc34265f54 Mon Sep 17 00:00:00 2001 From: shalinisudarsan <46514288+shalinisudarsan@users.noreply.github.com> Date: Wed, 21 Jan 2026 07:40:14 -0800 Subject: [PATCH 1/7] Add 2.541.x line and remove 2.504.x Added 2.541.x line and removed 2.504.x --- CONTRIBUTING.md | 2 +- README.md | 3 +- bom-2.504.x/pom.xml | 196 ------------------ bom-2.528.x/pom.xml | 2 +- bom-2.541.x/pom.xml | 23 ++ excludes.txt | 6 - pom.xml | 2 +- release-manager-scripts/bom-test-all-lines.sh | 2 +- sample-plugin/pom.xml | 14 +- 9 files changed, 36 insertions(+), 214 deletions(-) delete mode 100644 bom-2.504.x/pom.xml create mode 100644 bom-2.541.x/pom.xml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 64a4923c2..06ca166c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,7 +84,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh optionally also passing either ``` -LINE=2.504.x +LINE=2.516.x ``` or diff --git a/README.md b/README.md index 07c49c7f8..d2d468348 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 -2.504 +2.516 ${jenkins.baseline}.3 ``` @@ -104,6 +104,7 @@ When an older Jenkins version is used, then the matching older version of the pl | bom-2.462.x | 4228.v0a_71308d905b_ | Last LTS to support Java 11 | | bom-2.479.x | 5054.v620b_5d2b_d5e6 | First LTS to require Java 17 | | bom-2.492.x | 5473.vb_9533d9e5d88 | | +| bom-2.504.x | 5888.vd99c2b_38128d | | The latest versions of all BOM lines are available from the [Jenkins artifact repository](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom). diff --git a/bom-2.504.x/pom.xml b/bom-2.504.x/pom.xml deleted file mode 100644 index f9e991ecd..000000000 --- a/bom-2.504.x/pom.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.504.x - pom - - 2.3.4-1400.vb_1e3e3c4dfc8 - 3.1754.v2a_6613b_77002 - 6.1167.v022176c7e0ca_ - 1567.vb_2c3a_2116860 - - - - - ${project.groupId} - bom-2.516.x - ${project.version} - pom - import - - - io.jenkins.plugins - analysis-model-api - 13.9.0-909.v97dd3a_07c53e - - - io.jenkins.plugins - bootstrap5-api - 5.3.8-890.v1c5cf4fa_178e - - - io.jenkins.plugins - coverage - 2.2941.v08df75b_767f1 - - - io.jenkins.plugins - customizable-header - 175.v07c36327359a_ - - - io.jenkins.plugins - dark-theme - 524.vd675b_22b_30cb_ - - - io.jenkins.plugins - data-tables-api - ${data-tables-api.version} - - - io.jenkins.plugins - data-tables-api - ${data-tables-api.version} - tests - - - io.jenkins.plugins - design-library - 374.v9466b_9e00db_b_ - - - io.jenkins.plugins - echarts-api - 6.0.0-1146.v5c8f3b_8f0573 - - - io.jenkins.plugins - flatpickr-api - 4.6.13-18.vcf5f6a_5b_8468 - - - io.jenkins.plugins - font-awesome-api - 7.0.1-859.v128d3a_efb_6e5 - - - io.jenkins.plugins - forensics-api - ${forensics-api.version} - - - io.jenkins.plugins - forensics-api - ${forensics-api.version} - tests - - - io.jenkins.plugins - git-forensics - 3.2088.v3a_896f5e4937 - - - io.jenkins.plugins - gitea-checks - 595.vcec3b_27d9ca_e - - - io.jenkins.plugins - jquery3-api - 3.7.1-594.vb_3864f326cf0 - - - io.jenkins.plugins - plugin-util-api - ${plugin-util-api.version} - - - io.jenkins.plugins - plugin-util-api - ${plugin-util-api.version} - tests - - - io.jenkins.plugins - prism-api - 1.30.0-609.vf0a_df102d9a_f - - - io.jenkins.plugins - warnings-ng - 12.9783.ve1cb_9f060738 - - - org.jenkins-ci.plugins - ansible - 588.v2a_a_a_f345e34f - - - org.jenkins-ci.plugins - azure-keyvault - 327.v3f37dc30312a_ - - - org.jenkins-ci.plugins - azure-vm-agents - 1050.v45467b_03322a_ - - - org.jenkins-ci.plugins - badge - 2.12 - - - org.jenkins-ci.plugins - build-timeout - 1.38 - - - org.jenkins-ci.plugins - gitlab-plugin - 1.9.12 - - - org.jenkins-ci.plugins - jobcacher - 764.v098c635e4315 - - - org.jenkins-ci.plugins - ldap - 780.vcb_33c9a_e4332 - - - org.jenkins-ci.plugins - parameter-separator - 296.v9b_a_90c81160d - - - org.jenkins-ci.plugins - pipeline-maven - ${pipeline-maven-plugin.version} - - - org.jenkins-ci.plugins - pipeline-maven-api - ${pipeline-maven-plugin.version} - - - org.jenkins-ci.plugins - pipeline-maven-database - ${pipeline-maven-plugin.version} - - - org.jvnet.hudson.plugins - favorite - 2.253.v9b_413168133b_ - - - - diff --git a/bom-2.528.x/pom.xml b/bom-2.528.x/pom.xml index 3589912b3..7e608b60a 100644 --- a/bom-2.528.x/pom.xml +++ b/bom-2.528.x/pom.xml @@ -16,7 +16,7 @@ ${project.groupId} - bom-weekly + bom-2.541.x ${project.version} pom import diff --git a/bom-2.541.x/pom.xml b/bom-2.541.x/pom.xml new file mode 100644 index 000000000..6e76727d3 --- /dev/null +++ b/bom-2.541.x/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + io.jenkins.tools.bom + parent + ${changelist} + + bom-2.541.x + pom + + + + + ${project.groupId} + bom-weekly + ${project.version} + pom + import + + + + diff --git a/excludes.txt b/excludes.txt index cb359309f..0a8490516 100644 --- a/excludes.txt +++ b/excludes.txt @@ -17,9 +17,3 @@ org.jenkinsci.plugins.pipeline.modeldefinition.TriggersTest # TODO Blue Ocean Bitbucket test fails for Wiremock mismatch: https://github.com/jenkinsci/blueocean-plugin/pull/2654 io.jenkins.blueocean.blueocean_bitbucket_pipeline.server.BitbucketPipelineCreateRequestTest - -# TODO Remove when 2.504.x line is dropped https://github.com/jenkinsci/bom/pull/5751#issuecomment-3338544666 -# CasC output updated in new release but the ldap and azure-vm-agents releases with the updated test require 2.516.x or newer -com.microsoft.azure.vmagent.test.jcasc.AdvancedConfigAsCodeTest#exportExportConfiguration -com.microsoft.azure.vmagent.test.jcasc.BasicConfigAsCodeTest#exportBasicConfiguration -jenkins.security.plugins.ldap.CascSecurityRealmTest#export_ldap_no_secret diff --git a/pom.xml b/pom.xml index 23b4844dd..bacf4be25 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ bom-weekly + bom-2.541.x bom-2.528.x bom-2.516.x - bom-2.504.x sample-plugin diff --git a/release-manager-scripts/bom-test-all-lines.sh b/release-manager-scripts/bom-test-all-lines.sh index 489305f42..34f0e9fa6 100755 --- a/release-manager-scripts/bom-test-all-lines.sh +++ b/release-manager-scripts/bom-test-all-lines.sh @@ -9,6 +9,6 @@ if [[ $# -ne 1 ]]; then fi ${HERE}/bom-line-test.sh weekly $1 +${HERE}/bom-line-test.sh 2.541.x $1 ${HERE}/bom-line-test.sh 2.528.x $1 ${HERE}/bom-line-test.sh 2.516.x $1 -${HERE}/bom-line-test.sh 2.504.x $1 diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index d889d9816..4ebdb1478 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -1757,6 +1757,13 @@ + + 2.541.x + + 2.541.x + 2.541.1-rc37778.ff54607d5228 + + 2.528.x @@ -1771,12 +1778,5 @@ 2.516.3 - - 2.504.x - - 2.504.x - 2.504.3 - - From 9882faf0767c93cd738599844786d920f1cfe19f Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 22 Jan 2026 20:00:38 -0700 Subject: [PATCH 2/7] Test gitea-checks 601.609.v7b_5ee1a_655f2 incremental Built from pull request: * https://github.com/jenkinsci/gitea-checks-plugin/pull/307 --- bom-2.516.x/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bom-2.516.x/pom.xml b/bom-2.516.x/pom.xml index c6d64ebb7..cd6782cf9 100644 --- a/bom-2.516.x/pom.xml +++ b/bom-2.516.x/pom.xml @@ -28,7 +28,8 @@ io.jenkins.plugins gitea-checks - 601.607.vcea_0049b_27e5 + + 601.609.v7b_5ee1a_655f2 org.jenkins-ci.plugins From ebcc02baa40740dfa339bd8ff5c529a4129f1589 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 22 Jan 2026 20:02:25 -0700 Subject: [PATCH 3/7] Update final release of 2.504.x line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d2d468348..3ead5d12d 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ When an older Jenkins version is used, then the matching older version of the pl | bom-2.462.x | 4228.v0a_71308d905b_ | Last LTS to support Java 11 | | bom-2.479.x | 5054.v620b_5d2b_d5e6 | First LTS to require Java 17 | | bom-2.492.x | 5473.vb_9533d9e5d88 | | -| bom-2.504.x | 5888.vd99c2b_38128d | | +| bom-2.504.x | 5933.vcf06f7b_5d1a_2 | | 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 f70a34e66810a93e574cd97e2ec92d6c4f5d893d Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 22 Jan 2026 22:19:31 -0700 Subject: [PATCH 4/7] Use instant-messaging incremental 2.884.veda_553935c84 From pull request: * https://github.com/jenkinsci/instant-messaging-plugin/pull/308 --- bom-weekly/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml index 2ea4a74ac..1bed272dd 100644 --- a/bom-weekly/pom.xml +++ b/bom-weekly/pom.xml @@ -1979,7 +1979,8 @@ org.jvnet.hudson.plugins instant-messaging - 2.882.v5363d4fd02fb_ + + 2.884.veda_553935c84 org.jvnet.hudson.plugins From 887b32f8341d25fde90974e8bb1d5b1aef8174e1 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Thu, 22 Jan 2026 22:40:40 -0700 Subject: [PATCH 5/7] Use workflow-job incremental 1572.v4a_176c455367 Pull request: * https://github.com/jenkinsci/workflow-job-plugin/pull/741 --- bom-weekly/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml index 1bed272dd..fddde76c2 100644 --- a/bom-weekly/pom.xml +++ b/bom-weekly/pom.xml @@ -33,7 +33,8 @@ 1303.vcfd9679fb_c12 1398.v67030756d3fb_ 4254.v0c8e228524ea_ - 1570.v75b_888a_138a_3 + + 1572.v4a_176c455367 821.vc3b_4ea_780798 710.v3e456cc85233 1010.vb_b_39488a_9841 From 272eb769c55584014d0e2fe334e13b960563242d Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 24 Jan 2026 05:03:58 -0700 Subject: [PATCH 6/7] Document the final release for 2.504.x line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ead5d12d..216557b57 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ When an older Jenkins version is used, then the matching older version of the pl | bom-2.462.x | 4228.v0a_71308d905b_ | Last LTS to support Java 11 | | bom-2.479.x | 5054.v620b_5d2b_d5e6 | First LTS to require Java 17 | | bom-2.492.x | 5473.vb_9533d9e5d88 | | -| bom-2.504.x | 5933.vcf06f7b_5d1a_2 | | +| bom-2.504.x | 5983.v443959746f1f | | 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 d7897dbfd315a2d4683d0a2656d6ffef49254058 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sat, 24 Jan 2026 05:11:30 -0700 Subject: [PATCH 7/7] Fix a merge mistake --- bom-weekly/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bom-weekly/pom.xml b/bom-weekly/pom.xml index 1abb432fa..864d84c4a 100644 --- a/bom-weekly/pom.xml +++ b/bom-weekly/pom.xml @@ -1979,12 +1979,7 @@ org.jvnet.hudson.plugins instant-messaging -<<<<<<< HEAD - - 2.884.veda_553935c84 -======= 2.875.v954b_d3f33534 ->>>>>>> master org.jvnet.hudson.plugins