diff --git a/README.md b/README.md index e3d184013..35e8994bf 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.426.3 +2.440.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.426.x + bom-2.440.x import pom @@ -97,6 +97,7 @@ When an older Jenkins version is used, then the matching older version of the pl | bom-2.387.x | 2543.vfb_1a_5fb_9496d | | | bom-2.401.x | 2745.vc7b_fe4c876fa_ | | | bom-2.414.x | 2982.vdce2153031a_0 | | +| bom-2.426.x | 3208.vb_21177d4b_cd9 | | The latest versions of all BOM lines are available from the [Jenkins artifact repository](https://repo.jenkins-ci.org/public/io/jenkins/tools/bom). @@ -182,7 +183,7 @@ PLUGINS=structs,mailer TEST=InjectedTest bash local-test.sh optionally also passing either ``` -LINE=2.426.x +LINE=2.440.x ``` or diff --git a/bom-2.426.x/pom.xml b/bom-2.426.x/pom.xml deleted file mode 100644 index 5d38be031..000000000 --- a/bom-2.426.x/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - 4.0.0 - - io.jenkins.tools.bom - parent - ${changelist} - - bom-2.426.x - pom - - 6.858.v898218f3609d - 1261.v040121d29c7c - 1385.vb_58b_86ea_fff1 - - - - - ${project.groupId} - bom-2.440.x - ${project.version} - pom - import - - - io.jenkins.plugins - markdown-formatter - 167.v8a_428ca_49f89 - - - io.jenkins.plugins - pipeline-graph-view - 215.217.v2f6b_05084f10 - - - org.6wind.jenkins - lockable-resources - 1245.1247.vea_384d871c85 - - - 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 - email-ext - 2.105 - - - org.jenkins-ci.plugins - git-client - 4.7.0 - - - org.jenkins-ci.plugins - htmlpublisher - 1.35 - - - org.jenkins-ci.plugins - mailer - 470.vc91f60c5d8e2 - - - org.jenkins-ci.plugins - matrix-project - 822.824.v14451b_c0fd42 - - - org.jenkins-ci.plugins - pipeline-input-step - 477.v339683a_8d55e - - - org.jenkins-ci.plugins - pipeline-utility-steps - 2.16.2 - - - org.jenkins-ci.plugins - role-strategy - 717.v6a_69a_fe98974 - - - org.jenkins-ci.plugins - subversion - ${subversion-plugin.version} - - - org.jenkins-ci.plugins - subversion - ${subversion-plugin.version} - tests - - - org.jenkins-ci.plugins.workflow - workflow-durable-task-step - 1331.vc8c2fed35334 - - - 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.452.x/pom.xml b/bom-2.452.x/pom.xml index 27f19a8a3..fbf7f1f6f 100644 --- a/bom-2.452.x/pom.xml +++ b/bom-2.452.x/pom.xml @@ -17,7 +17,7 @@ ${project.groupId} - bom-weekly + bom-2.462.x ${project.version} pom import diff --git a/bom-2.462.x/pom.xml b/bom-2.462.x/pom.xml new file mode 100644 index 000000000..4278e7e10 --- /dev/null +++ b/bom-2.462.x/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + io.jenkins.tools.bom + parent + ${changelist} + + bom-2.462.x + pom + + + + ${project.groupId} + bom-weekly + ${project.version} + pom + import + + + + diff --git a/pct.sh b/pct.sh index d3bccf0bb..3729dfe02 100755 --- a/pct.sh +++ b/pct.sh @@ -20,16 +20,6 @@ if ! [[ $PLUGINS =~ blueocean || $PLUGINS =~ lockable-resources || $PLUGINS =~ p PCT_D_ARGS+='-DforkCount=.75C ' fi -# -# jenkinsci/workflow-cps-plugin#877 depends on jenkinsci/jenkins#9012, but only -# on Java 17 and newer. The 2.426.x line is the only remaining line to which -# jenkinsci/jenkins#9012 has not been backported. When we drop support for -# 2.426.x, this should be deleted. -# -if [[ $PLUGINS =~ pipeline-groovy-lib && $LINE == 2.426.x ]]; then - echo 'org.jenkinsci.plugins.workflow.libs.LibraryMemoryTest#loaderReleased' >>excludes.txt -fi - exec java \ -jar target/pct.jar \ test-plugins \ diff --git a/pom.xml b/pom.xml index a160c0d51..bfb55fa33 100644 --- a/pom.xml +++ b/pom.xml @@ -20,9 +20,9 @@ bom-weekly + bom-2.462.x bom-2.452.x bom-2.440.x - bom-2.426.x sample-plugin diff --git a/sample-plugin/pom.xml b/sample-plugin/pom.xml index 6af6396a1..6f402e1ff 100644 --- a/sample-plugin/pom.xml +++ b/sample-plugin/pom.xml @@ -1089,11 +1089,19 @@ + + 2.462.x + + 2.462.x + + 2.462 + + 2.452.x 2.452.x - 2.452.1 + 2.452.3 @@ -1103,12 +1111,5 @@ 2.440.3 - - 2.426.x - - 2.426.x - 2.426.3 - -