From c252176ed442d5b872021ca58e1b8190d2dd5109 Mon Sep 17 00:00:00 2001 From: jplayout <1021493+jplayout@users.noreply.github.com> Date: Sun, 19 Jan 2025 22:24:16 +0100 Subject: [PATCH] Add 2.492.x release line, remove 2.452.x release line (#4231) * Add 2.492.x release line, remove 2.452.x release line Add 2.492.x release line Remove 2.452.x line Replace 2.452 with 2.462 in documentation Document the (almost) final 2.452.x BOM version Testing done Confirmed that mvn clean verify and PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh pass. * Update final release of 2.452.x line --------- Co-authored-by: Mark Waite --- CONTRIBUTING.md | 2 +- README.md | 5 +- bom-2.452.x/pom.xml | 159 ------------------------------------------ bom-2.479.x/pom.xml | 2 +- bom-2.492.x/pom.xml | 23 ++++++ pom.xml | 2 +- sample-plugin/pom.xml | 27 +++---- 7 files changed, 37 insertions(+), 183 deletions(-) delete mode 100644 bom-2.452.x/pom.xml create mode 100644 bom-2.492.x/pom.xml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d06b7f736..7efbf32fe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,7 +95,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh optionally also passing either ``` -LINE=2.452.x +LINE=2.462.x ``` or diff --git a/README.md b/README.md index 772c4ddca..7bae3aacb 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.452.4 +2.462.3 ``` 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 io.jenkins.tools.bom - bom-2.452.x + bom-2.462.x … import pom @@ -99,6 +99,7 @@ When an older Jenkins version is used, then the matching older version of the pl | bom-2.414.x | 2982.vdce2153031a_0 | | | bom-2.426.x | 3208.vb_21177d4b_cd9 | | | bom-2.440.x | 3435.v238d66a_043fb_ | | +| bom-2.452.x | 3944.v1a_e4f8b_452db_ | | 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.452.x/pom.xml b/bom-2.452.x/pom.xml deleted file mode 100644 index 8fa2ed0d3..000000000 --- a/bom-2.452.x/pom.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.452.x - pom - - 6.928.v7c780211d66e - 4.1.0 - 1269.v53185011cd9f - 1400.v7fd111b_ec82f - 783.va_6eb_ef636fb_d - - - - - ${project.groupId} - bom-2.462.x - ${project.version} - pom - import - - - io.jenkins.plugins - asm-api - 9.7-33.v4d23ef79fcc8 - - - io.jenkins.plugins - custom-folder-icon - 2.9 - - - io.jenkins.plugins - dark-theme - 439.vdef09f81f85e - - - io.jenkins.plugins - design-library - 303.v6b_23c12334c9 - - - io.jenkins.plugins - extra-tool-installers - 139.v723fee51b_7f2 - - - io.jenkins.plugins - gitlab-kubernetes-credentials - 259.v7c72898df530 - - - io.jenkins.plugins - plugin-util-api - ${plugin-util-api.version} - - - io.jenkins.plugins - plugin-util-api - ${plugin-util-api.version} - tests - - - org.jenkins-ci.plugins - azure-credentials - 341.v4881e9f4ffea_ - - - org.jenkins-ci.plugins - cloudbees-bitbucket-branch-source - 895.v15dc41668f03 - - - org.jenkins-ci.plugins - cloudbees-folder - ${cloudbees-folder-plugin.version} - - - org.jenkins-ci.plugins - cloudbees-folder - ${cloudbees-folder-plugin.version} - tests - - - org.jenkins-ci.plugins - credentials - 1380.va_435002fa_924 - - - org.jenkins-ci.plugins - email-ext - 1844.v3ea_a_b_842374a_ - - - org.jenkins-ci.plugins - hidden-parameter - 237.v4b_df26c7a_f0e - - - org.jenkins-ci.plugins - job-dsl - 1.87 - - - org.jenkins-ci.plugins - parameter-separator - 166.vd0120849b_386 - - - org.jenkins-ci.plugins - sonar - 2.17.2 - - - org.jenkins-ci.plugins - ssh-credentials - 343.v884f71d78167 - - - org.jenkins-ci.plugins - subversion - ${subversion-plugin.version} - - - org.jenkins-ci.plugins - subversion - ${subversion-plugin.version} - tests - - - org.jenkins-ci.plugins.workflow - workflow-job - ${workflow-job-plugin.version} - - - org.jenkins-ci.plugins.workflow - workflow-job - ${workflow-job-plugin.version} - tests - - - org.jenkins-ci.plugins.workflow - workflow-multibranch - ${workflow-multibranch-plugin.version} - - - org.jenkins-ci.plugins.workflow - workflow-multibranch - ${workflow-multibranch-plugin.version} - tests - - - - diff --git a/bom-2.479.x/pom.xml b/bom-2.479.x/pom.xml index c3de9c074..4fe0cc043 100644 --- a/bom-2.479.x/pom.xml +++ b/bom-2.479.x/pom.xml @@ -12,7 +12,7 @@ ${project.groupId} - bom-weekly + bom-2.492.x ${project.version} pom import diff --git a/bom-2.492.x/pom.xml b/bom-2.492.x/pom.xml new file mode 100644 index 000000000..a6e29b5fc --- /dev/null +++ b/bom-2.492.x/pom.xml @@ -0,0 +1,23 @@ + + + 4.0.0 + + io.jenkins.tools.bom + parent + ${changelist} + + bom-2.492.x + pom + + + + + ${project.groupId} + bom-weekly + ${project.version} + pom + import + + + + diff --git a/pom.xml b/pom.xml index 8e007d5f5..056843823 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ bom-weekly + bom-2.492.x bom-2.479.x bom-2.462.x - bom-2.452.x sample-plugin diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index 477872b61..3cccef8fa 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -1520,6 +1520,14 @@ + + 2.492.x + + 2.492.x + + 2.492 + + 2.479.x @@ -1537,24 +1545,5 @@ 11 - - 2.452.x - - 2.452.x - 3.57 - 2.452.4 - 2225.2230.v6210cb_b_827f9 - 11 - - - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - - - -