diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 88e619469..33c8fbfcb 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.516.x +LINE=2.528.x ``` or diff --git a/README.md b/README.md index 216557b57..a14c2f535 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.516 +2.528 ${jenkins.baseline}.3 ``` @@ -105,6 +105,7 @@ When an older Jenkins version is used, then the matching older version of the pl | 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 | 5983.v443959746f1f | | +| bom-2.516.x | 6210.v69ea_fd8a_f010 | | 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.516.x/pom.xml b/bom-2.516.x/pom.xml deleted file mode 100644 index 1f1042bec..000000000 --- a/bom-2.516.x/pom.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.516.x - pom - - 6.1053.vd62fb_b_f7367b_ - 1611.v6a_00c04177b_b_ - - - - - ${project.groupId} - bom-2.528.x - ${project.version} - pom - import - - - igalg.jenkins.plugins - multibranch-build-strategy-extension - 64.v348e3c69f1f5 - - - io.jenkins.plugins - dark-theme - 574.va_19f05d54df5 - - - io.jenkins.plugins - oidc-provider - 170.v15f73e25a_e28 - - - 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 - 1487.va_d001ede2c31 - - - org.jenkins-ci.plugins - envinject - 2.926.v69c9b_3896a_96 - - - org.jenkins-ci.plugins - parameterized-scheduler - 378.va_234d1c44456 - - - 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} - - - - diff --git a/bom-2.541.x/pom.xml b/bom-2.541.x/pom.xml index 3b1b5ee57..fc031b338 100644 --- a/bom-2.541.x/pom.xml +++ b/bom-2.541.x/pom.xml @@ -15,22 +15,11 @@ ${project.groupId} - bom-weekly + bom-2.555.x ${project.version} pom import - - org.jenkins-ci.plugins.workflow - workflow-job - ${workflow-job-plugin.version} - - - org.jenkins-ci.plugins.workflow - workflow-job - ${workflow-job-plugin.version} - tests - diff --git a/bom-2.555.x/pom.xml b/bom-2.555.x/pom.xml new file mode 100644 index 000000000..675577d05 --- /dev/null +++ b/bom-2.555.x/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + io.jenkins.tools.bom + parent + ${changelist} + + bom-2.555.x + pom + + 1571.vb_423c255d6d9 + + + + + ${project.groupId} + bom-weekly + ${project.version} + pom + import + + + org.jenkins-ci.plugins.workflow + workflow-job + ${workflow-job-plugin.version} + + + org.jenkins-ci.plugins.workflow + workflow-job + ${workflow-job-plugin.version} + tests + + + + diff --git a/pom.xml b/pom.xml index bacf4be25..44e273507 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ bom-weekly + bom-2.555.x bom-2.541.x bom-2.528.x - bom-2.516.x sample-plugin diff --git a/release-manager-scripts/bom-test-all-lines.sh b/release-manager-scripts/bom-test-all-lines.sh index 34f0e9fa6..3b181a08c 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.551.x $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 diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index 0c951dca1..ba02eb4a9 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -1697,6 +1697,14 @@ + + 2.555.x + + 2.555.x + + 2.555 + + 2.541.x @@ -1711,12 +1719,5 @@ 2.528.3 - - 2.516.x - - 2.516.x - 2.516.3 - -