From a5bb0fd919b3450b1112d3cc05a3beb28f5232c9 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Fri, 8 Aug 2025 21:47:52 +0200 Subject: [PATCH 01/16] show parameters readonly also removes the injected inline javascript for checkboxes with `readonly` attribute set. --- .../hudson/model/BooleanParameterValue/value.jelly | 2 +- .../hudson/model/ParametersAction/index.jelly | 1 + .../hudson/model/StringParameterValue/value.jelly | 12 ++++++------ .../hudson/model/TextParameterValue/value.jelly | 9 +++++---- core/src/main/resources/lib/form/checkbox.jelly | 4 ++-- core/src/main/resources/lib/form/radio.jelly | 10 ++++++++-- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly b/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly index ba45b2262c..406a213578 100644 --- a/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly +++ b/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly @@ -28,6 +28,6 @@ THE SOFTWARE. xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project"> - + diff --git a/core/src/main/resources/hudson/model/ParametersAction/index.jelly b/core/src/main/resources/hudson/model/ParametersAction/index.jelly index c8e8bf3aaf..fe9a2f0415 100644 --- a/core/src/main/resources/hudson/model/ParametersAction/index.jelly +++ b/core/src/main/resources/hudson/model/ParametersAction/index.jelly @@ -35,6 +35,7 @@ THE SOFTWARE. ${title} + diff --git a/core/src/main/resources/hudson/model/StringParameterValue/value.jelly b/core/src/main/resources/hudson/model/StringParameterValue/value.jelly index e3de9ff09a..221ae85283 100644 --- a/core/src/main/resources/hudson/model/StringParameterValue/value.jelly +++ b/core/src/main/resources/hudson/model/StringParameterValue/value.jelly @@ -24,10 +24,10 @@ THE SOFTWARE. - - - - + xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" + xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project"> + + + + \ No newline at end of file diff --git a/core/src/main/resources/hudson/model/TextParameterValue/value.jelly b/core/src/main/resources/hudson/model/TextParameterValue/value.jelly index 8ae92827ad..c46b884987 100644 --- a/core/src/main/resources/hudson/model/TextParameterValue/value.jelly +++ b/core/src/main/resources/hudson/model/TextParameterValue/value.jelly @@ -26,8 +26,9 @@ THE SOFTWARE. - - - - + + + + + \ No newline at end of file diff --git a/core/src/main/resources/lib/form/checkbox.jelly b/core/src/main/resources/lib/form/checkbox.jelly index de831954ca..5b9807c501 100644 --- a/core/src/main/resources/lib/form/checkbox.jelly +++ b/core/src/main/resources/lib/form/checkbox.jelly @@ -83,9 +83,9 @@ THE SOFTWARE. name="${name}" value="${attrs.value}" title="${attrs.tooltip}" - onclick="${attrs.readonly=='true' ? 'return false;' : attrs.onclick}" id="${attrs.id}" class="${attrs.class} ${attrs.negative!=null ? 'negative' : null} ${attrs.checkUrl!=null?'validated':''}" + onclick="${attrs.readonly=='true' ? null : attrs.onclick}" id="${attrs.id}" class="${attrs.class} ${attrs.negative!=null ? 'negative' : null} ${attrs.checkUrl!=null?'validated':''}" checkUrl="${attrs.checkUrl}" checkDependsOn="${attrs.checkDependsOn}" json="${attrs.json}" - disabled="${readOnlyMode ? 'true' : null}" + disabled="${readOnlyMode or attrs.readonly=='true' ? 'true' : null}" checked="${value ? 'true' : null}"/> diff --git a/core/src/main/resources/lib/form/radio.jelly b/core/src/main/resources/lib/form/radio.jelly index a920c99ee2..2f085d3f64 100644 --- a/core/src/main/resources/lib/form/radio.jelly +++ b/core/src/main/resources/lib/form/radio.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. - tag that takes true/false for @checked, which is more Jelly friendly. Note that Safari doesn't support onchange. @@ -38,7 +38,13 @@ THE SOFTWARE. - + + Inline JavaScript to execute when the checkbox is clicked. + Deprecated because this attribute is incompatible with adding Content-Security-Policy to the Jenkins UI in the future. + Set 'id' or 'class' attributes as appropriate to look up this element in external Javascript files (e.g. adjuncts) + to add the desired behavior there (DOMContentLoaded event in static forms, Behaviour.specify if this element may be + dynamically added). See https://github.com/jenkinsci/jenkins/pull/6852 for an example. + If specified, this human readable text will follow the radio, and clicking this text also toggles the radio. From 00770c4e78ce45220ac5284cd693f4092fa1e893 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Sun, 10 Aug 2025 14:25:12 +0200 Subject: [PATCH 02/16] fix test --- .../resources/hudson/model/BooleanParameterValue/value.jelly | 1 + .../resources/hudson/model/StringParameterValue/value.jelly | 1 + test/src/test/java/hudson/model/ParametersTest.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly b/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly index 406a213578..3d249ff3ab 100644 --- a/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly +++ b/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly @@ -28,6 +28,7 @@ THE SOFTWARE. xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project"> + diff --git a/core/src/main/resources/hudson/model/StringParameterValue/value.jelly b/core/src/main/resources/hudson/model/StringParameterValue/value.jelly index 221ae85283..7c5328f667 100644 --- a/core/src/main/resources/hudson/model/StringParameterValue/value.jelly +++ b/core/src/main/resources/hudson/model/StringParameterValue/value.jelly @@ -28,6 +28,7 @@ THE SOFTWARE. xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project"> + \ No newline at end of file diff --git a/test/src/test/java/hudson/model/ParametersTest.java b/test/src/test/java/hudson/model/ParametersTest.java index 1b9e135ed9..996bdc6460 100644 --- a/test/src/test/java/hudson/model/ParametersTest.java +++ b/test/src/test/java/hudson/model/ParametersTest.java @@ -267,7 +267,7 @@ class ParametersTest { assertAll( () -> assertThat("parameters page should escape param name", text2, containsString("<param name>")), () -> assertThat("parameters page should not leave param name unescaped", text2, not(containsString(""))), - () -> assertThat("parameters page should escape param value", text2, containsString("<param value>")), + () -> assertThat("parameters page should escape param value", text2, containsString("<param value>")), () -> assertThat("parameters page should not leave param value unescaped", text2, not(containsString(""))), () -> assertThat("parameters page should mark up param description", text2, containsString("[param description]")), () -> assertThat("parameters page should not leave param description unescaped", text2, not(containsString(""))) From f045ccf8e8a16af833a4da8d6594055c5f62d312 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:08:00 -0700 Subject: [PATCH 03/16] Update actions/checkout action to v5 (#10947) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/changelog.yml | 2 +- .github/workflows/publish-release-artifact.yml | 2 +- .github/workflows/run-since-updater.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index f7032327b8..3ee404dc4f 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -54,7 +54,7 @@ jobs: repositories: >- ["jenkins.io"] - name: Check out - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 - name: Publish jenkins.io changelog draft diff --git a/.github/workflows/publish-release-artifact.yml b/.github/workflows/publish-release-artifact.yml index 0fe96d74b0..434ec65ff7 100644 --- a/.github/workflows/publish-release-artifact.yml +++ b/.github/workflows/publish-release-artifact.yml @@ -15,7 +15,7 @@ jobs: is-lts: ${{ steps.set-version.outputs.is-lts }} is-rc: ${{ steps.set-version.outputs.is-rc }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK 17 uses: actions/setup-java@v4 with: diff --git a/.github/workflows/run-since-updater.yml b/.github/workflows/run-since-updater.yml index 45fc101d60..0b097bedbc 100644 --- a/.github/workflows/run-since-updater.yml +++ b/.github/workflows/run-since-updater.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: ${{ github.repository_owner == 'jenkinsci' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - name: Run update-since-todo.py From 19a767ad6bc414855ede641335edfa743a49fe62 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 10:10:07 -0700 Subject: [PATCH 04/16] Update dependency org.jenkins-ci.modules:sshd to v3.374.v19b_d59ce6610 (#10944) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index fda7d443a9..eecec7e8d2 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -464,7 +464,7 @@ THE SOFTWARE. org.jenkins-ci.modules sshd - 3.372.v5d04a_e92d8cf + 3.374.v19b_d59ce6610 hpi From 7d2e23edb8852ec00caf13f0e4e309151e1c198c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 13:16:43 -0700 Subject: [PATCH 05/16] Update dependency mini-css-extract-plugin to v2.9.4 (#10950) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index ff92b0c1bd..e92412e2ff 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eslint-formatter-checkstyle": "8.40.0", "globals": "16.3.0", "handlebars-loader": "1.7.3", - "mini-css-extract-plugin": "2.9.3", + "mini-css-extract-plugin": "2.9.4", "postcss": "8.5.6", "postcss-loader": "8.1.1", "postcss-preset-env": "10.2.4", diff --git a/yarn.lock b/yarn.lock index ec3d807c8e..6c27862d47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4362,7 +4362,7 @@ __metadata: hotkeys-js: "npm:3.12.2" jquery: "npm:3.7.1" lodash: "npm:4.17.21" - mini-css-extract-plugin: "npm:2.9.3" + mini-css-extract-plugin: "npm:2.9.4" postcss: "npm:8.5.6" postcss-loader: "npm:8.1.1" postcss-preset-env: "npm:10.2.4" @@ -4814,15 +4814,15 @@ __metadata: languageName: node linkType: hard -"mini-css-extract-plugin@npm:2.9.3": - version: 2.9.3 - resolution: "mini-css-extract-plugin@npm:2.9.3" +"mini-css-extract-plugin@npm:2.9.4": + version: 2.9.4 + resolution: "mini-css-extract-plugin@npm:2.9.4" dependencies: schema-utils: "npm:^4.0.0" tapable: "npm:^2.2.1" peerDependencies: webpack: ^5.0.0 - checksum: 10c0/2e661aeba2ffd6f8b8d618de3498c495f1e1628b76a8e3fb31f3685586d12ba7d166788b1d57912becff5a0f700c74625e4fe9d54874176d7a218af0c6f7c24f + checksum: 10c0/76f9e471784d52435ea766ce576ad23d37d0ea51c32ddc56414c8fdf14f7de44202dbc772cdf7549b7e54a5e56f569af93cfbd036d62d13ff8fd9571e53353b7 languageName: node linkType: hard From 834e5223d48ad2a2a8c76a5249391c9b58730e70 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Tue, 12 Aug 2025 03:06:40 +0100 Subject: [PATCH 06/16] Make shutdown and safe-restart messages theme aware (#10945) make shutdown and safe-restart message theme aware The global messages when Jenkins is in shutdown or in saferestart used hard coded colors. That doesn't look well with themes like solarized. --- src/main/scss/base/_style.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/scss/base/_style.scss b/src/main/scss/base/_style.scss index 645b4f8712..ea5b5dd279 100644 --- a/src/main/scss/base/_style.scss +++ b/src/main/scss/base/_style.scss @@ -64,8 +64,8 @@ td.no-wrap { #safe-restart-msg { font-weight: bold; - color: white; - background-color: var(--warning); + color: var(--background) !important; + background-color: var(--warning-color); text-align: center; margin-bottom: var(--section-padding); padding: 0.5em; @@ -75,8 +75,8 @@ td.no-wrap { #shutdown-msg { font-weight: bold; - color: white; - background-color: #ef2929; + color: var(--background) !important; + background-color: var(--destructive-color); text-align: center; margin-bottom: var(--section-padding); padding: 0.5em; From fe47fa52e86df1d8a9f2640e3265ae97a2f31e1c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 20:07:12 -0600 Subject: [PATCH 07/16] Update eslint monorepo to v9.33.0 (#10951) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 54 ++++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index e92412e2ff..13954e4496 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ "@babel/cli": "7.28.0", "@babel/core": "7.28.0", "@babel/preset-env": "7.28.0", - "@eslint/js": "9.32.0", + "@eslint/js": "9.33.0", "babel-loader": "10.0.0", "clean-webpack-plugin": "4.0.0", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.2", - "eslint": "9.32.0", + "eslint": "9.33.0", "eslint-config-prettier": "10.1.8", "eslint-formatter-checkstyle": "8.40.0", "globals": "16.3.0", diff --git a/yarn.lock b/yarn.lock index 6c27862d47..864f2c0d4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1688,19 +1688,19 @@ __metadata: languageName: node linkType: hard -"@eslint/config-helpers@npm:^0.3.0": - version: 0.3.0 - resolution: "@eslint/config-helpers@npm:0.3.0" - checksum: 10c0/013ae7b189eeae8b30cc2ee87bc5c9c091a9cd615579003290eb28bebad5d78806a478e74ba10b3fe08ed66975b52af7d2cd4b4b43990376412b14e5664878c8 +"@eslint/config-helpers@npm:^0.3.1": + version: 0.3.1 + resolution: "@eslint/config-helpers@npm:0.3.1" + checksum: 10c0/f6c5b3a0b76a0d7d84cc93e310c259e6c3e0792ddd0a62c5fc0027796ffae44183432cb74b2c2b1162801ee1b1b34a6beb5d90a151632b4df7349f994146a856 languageName: node linkType: hard -"@eslint/core@npm:^0.15.0, @eslint/core@npm:^0.15.1": - version: 0.15.1 - resolution: "@eslint/core@npm:0.15.1" +"@eslint/core@npm:^0.15.2": + version: 0.15.2 + resolution: "@eslint/core@npm:0.15.2" dependencies: "@types/json-schema": "npm:^7.0.15" - checksum: 10c0/abaf641940776638b8c15a38d99ce0dac551a8939310ec81b9acd15836a574cf362588eaab03ab11919bc2a0f9648b19ea8dee33bf12675eb5b6fd38bda6f25e + checksum: 10c0/c17a6dc4f5a6006ecb60165cc38bcd21fefb4a10c7a2578a0cfe5813bbd442531a87ed741da5adab5eb678e8e693fda2e2b14555b035355537e32bcec367ea17 languageName: node linkType: hard @@ -1721,10 +1721,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:9.32.0": - version: 9.32.0 - resolution: "@eslint/js@npm:9.32.0" - checksum: 10c0/f71e8f9146638d11fb15238279feff98801120a4d4130f1c587c4f09b024ff5ec01af1ba88e97ba6b7013488868898a668f77091300cc3d4394c7a8ed32d2667 +"@eslint/js@npm:9.33.0": + version: 9.33.0 + resolution: "@eslint/js@npm:9.33.0" + checksum: 10c0/4c42c9abde76a183b8e47205fd6c3116b058f82f07b6ad4de40de56cdb30a36e9ecd40efbea1b63a84d08c206aadbb0aa39a890197e1ad6455a8e542df98f186 languageName: node linkType: hard @@ -1735,13 +1735,13 @@ __metadata: languageName: node linkType: hard -"@eslint/plugin-kit@npm:^0.3.4": - version: 0.3.4 - resolution: "@eslint/plugin-kit@npm:0.3.4" +"@eslint/plugin-kit@npm:^0.3.5": + version: 0.3.5 + resolution: "@eslint/plugin-kit@npm:0.3.5" dependencies: - "@eslint/core": "npm:^0.15.1" + "@eslint/core": "npm:^0.15.2" levn: "npm:^0.4.1" - checksum: 10c0/64331ca100f62a0115d10419a28059d0f377e390192163b867b9019517433d5073d10b4ec21f754fa01faf832aceb34178745924baab2957486f8bf95fd628d2 + checksum: 10c0/c178c1b58c574200c0fd125af3e4bc775daba7ce434ba6d1eeaf9bcb64b2e9fea75efabffb3ed3ab28858e55a016a5efa95f509994ee4341b341199ca630b89e languageName: node linkType: hard @@ -3524,18 +3524,18 @@ __metadata: languageName: node linkType: hard -"eslint@npm:9.32.0": - version: 9.32.0 - resolution: "eslint@npm:9.32.0" +"eslint@npm:9.33.0": + version: 9.33.0 + resolution: "eslint@npm:9.33.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/regexpp": "npm:^4.12.1" "@eslint/config-array": "npm:^0.21.0" - "@eslint/config-helpers": "npm:^0.3.0" - "@eslint/core": "npm:^0.15.0" + "@eslint/config-helpers": "npm:^0.3.1" + "@eslint/core": "npm:^0.15.2" "@eslint/eslintrc": "npm:^3.3.1" - "@eslint/js": "npm:9.32.0" - "@eslint/plugin-kit": "npm:^0.3.4" + "@eslint/js": "npm:9.33.0" + "@eslint/plugin-kit": "npm:^0.3.5" "@humanfs/node": "npm:^0.16.6" "@humanwhocodes/module-importer": "npm:^1.0.1" "@humanwhocodes/retry": "npm:^0.4.2" @@ -3570,7 +3570,7 @@ __metadata: optional: true bin: eslint: bin/eslint.js - checksum: 10c0/e8a23924ec5f8b62e95483002ca25db74e25c23bd9c6d98a9f656ee32f820169bee3bfdf548ec728b16694f198b3db857d85a49210ee4a035242711d08fdc602 + checksum: 10c0/1e1f60d2b62d9d65553e9af916a8dccf00eeedd982103f35bf58c205803907cb1fda73ef595178d47384ea80d8624a182b63682a6b15d8387e9a5d86904a2a2d languageName: node linkType: hard @@ -4348,12 +4348,12 @@ __metadata: "@babel/cli": "npm:7.28.0" "@babel/core": "npm:7.28.0" "@babel/preset-env": "npm:7.28.0" - "@eslint/js": "npm:9.32.0" + "@eslint/js": "npm:9.33.0" babel-loader: "npm:10.0.0" clean-webpack-plugin: "npm:4.0.0" css-loader: "npm:7.1.2" css-minimizer-webpack-plugin: "npm:7.0.2" - eslint: "npm:9.32.0" + eslint: "npm:9.33.0" eslint-config-prettier: "npm:10.1.8" eslint-formatter-checkstyle: "npm:8.40.0" globals: "npm:16.3.0" From 6927480c328920209d83e69a9163b35621912aca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 20:07:32 -0600 Subject: [PATCH 08/16] Update dependency org.jenkins-ci.plugins:ant to v518 (#10952) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pom.xml b/test/pom.xml index bb29b7008e..b2f1aa8749 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -104,7 +104,7 @@ THE SOFTWARE. org.jenkins-ci.plugins ant - 513.vde9e7b_a_0da_0f + 518.v8d8dc7945eca_ org.jenkins-ci.plugins From 056b771cb9997bebd67cd4b7288afea9b9c48e87 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 20:37:07 -0600 Subject: [PATCH 09/16] Update dependency org.jenkins-ci.plugins:matrix-project to v855 (#10953) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index b2f1aa8749..da6ff615fa 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -262,7 +262,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 849.v0cd64ed7e531 + 855.va_10985fa_3219 test diff --git a/war/pom.xml b/war/pom.xml index eecec7e8d2..8320756f15 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -304,7 +304,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 849.v0cd64ed7e531 + 855.va_10985fa_3219 hpi From 712bc75af7507dfd5a690d1c60862798bbee35d9 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:07:48 +0000 Subject: [PATCH 10/16] [maven-release-plugin] prepare release jenkins-2.523 --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 6 +++--- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty12-ee9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index efdfced760..0af25340a1 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 8232a138fe..1b79cb91b1 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 cli diff --git a/core/pom.xml b/core/pom.xml index af4de420fd..3059123906 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index fe1e89a120..68b0e52728 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 jenkins-coverage diff --git a/pom.xml b/pom.xml index 6eb1ba2900..43dd88439c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 pom Jenkins main module @@ -63,7 +63,7 @@ THE SOFTWARE. scm:git:https://github.com/jenkinsci/jenkins.git scm:git:git@github.com:jenkinsci/jenkins.git - ${scmTag} + jenkins-2.523 https://github.com/jenkinsci/jenkins @@ -75,7 +75,7 @@ THE SOFTWARE. 2.523 -SNAPSHOT - 2025-08-05T13:07:43Z + 2025-08-12T10:33:04Z github diff --git a/test/pom.xml b/test/pom.xml index da6ff615fa..3b9a86b8e8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 8320756f15..a0009d2a93 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 jenkins-war diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml index 2253163b3c..9057bcdeb6 100644 --- a/websocket/jetty12-ee9/pom.xml +++ b/websocket/jetty12-ee9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 178413f92c..06fb1eb08f 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.523 ../.. From 0f1904b89897896722fc46c8e8c83b2574cae8a0 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:09:56 +0000 Subject: [PATCH 11/16] [maven-release-plugin] prepare for next development iteration --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 8 ++++---- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty12-ee9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 0af25340a1..efdfced760 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 1b79cb91b1..8232a138fe 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index 3059123906..af4de420fd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 68b0e52728..fe1e89a120 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} jenkins-coverage diff --git a/pom.xml b/pom.xml index 43dd88439c..9355102deb 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} pom Jenkins main module @@ -63,7 +63,7 @@ THE SOFTWARE. scm:git:https://github.com/jenkinsci/jenkins.git scm:git:git@github.com:jenkinsci/jenkins.git - jenkins-2.523 + ${scmTag} https://github.com/jenkinsci/jenkins @@ -73,9 +73,9 @@ THE SOFTWARE. - 2.523 + 2.524 -SNAPSHOT - 2025-08-12T10:33:04Z + 2025-08-12T13:07:48Z github diff --git a/test/pom.xml b/test/pom.xml index 3b9a86b8e8..da6ff615fa 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} jenkins-test diff --git a/war/pom.xml b/war/pom.xml index a0009d2a93..8320756f15 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} jenkins-war diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml index 9057bcdeb6..2253163b3c 100644 --- a/websocket/jetty12-ee9/pom.xml +++ b/websocket/jetty12-ee9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 06fb1eb08f..178413f92c 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.523 + ${revision}${changelist} ../.. From bfd88fb1d36f334d4d76cd102f4a785e5255c43a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:54:36 -0700 Subject: [PATCH 12/16] Update dependency org.jenkins-ci.plugins.workflow:workflow-api to v1384 (#10955) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index da6ff615fa..ea5f951965 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -132,7 +132,7 @@ THE SOFTWARE. org.jenkins-ci.plugins.workflow workflow-api - 1382.veca_a_efe062fa_ + 1384.vdc05a_48f535f org.jenkins-ci.plugins.workflow diff --git a/war/pom.xml b/war/pom.xml index 8320756f15..2b2f66bccf 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -325,7 +325,7 @@ THE SOFTWARE. org.jenkins-ci.plugins.workflow workflow-api - 1382.veca_a_efe062fa_ + 1384.vdc05a_48f535f hpi From c3d6bcd7c1e9be2c94aec16d04dde6e96e879261 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 17:30:07 -0700 Subject: [PATCH 13/16] Update dependency org.jenkins-ci.plugins:matrix-project to v856 (#10959) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index ea5f951965..6b7d8dd906 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -262,7 +262,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 855.va_10985fa_3219 + 856.v4c352b_3a_b_23e test diff --git a/war/pom.xml b/war/pom.xml index 2b2f66bccf..c5d6efff90 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -304,7 +304,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 855.va_10985fa_3219 + 856.v4c352b_3a_b_23e hpi From ba7766c28e4022c6fdba12af3ad82b439d3de058 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Wed, 13 Aug 2025 05:46:10 +0200 Subject: [PATCH 14/16] Update node from 22.x to 24.x (#10956) Signed-off-by: Alexander Brandes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9355102deb..6eace8e819 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ THE SOFTWARE. false 8.12 - 22.18.0 + 24.5.0 jakarta.servlet.jsp.jstl @@ -568,7 +568,7 @@ THE SOFTWARE. - com.infradna.tool + io.jenkins.tools bridge-method-injector diff --git a/pom.xml b/pom.xml index 6eace8e819..98b09a005d 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ THE SOFTWARE. 1.35 4.13.2 - 1.31 + 1.32 false 8.12 @@ -223,7 +223,7 @@ THE SOFTWARE. 1.1 - com.infradna.tool + io.jenkins.tools bridge-method-injector ${bridge-method-injector.version} diff --git a/war/pom.xml b/war/pom.xml index c5d6efff90..a3fc11f644 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -148,7 +148,7 @@ THE SOFTWARE. 11 - com.infradna.tool:bridge-method-annotation + io.jenkins.tools:bridge-method-annotation org.jenkins-ci:annotation-indexer org.jenkins-ci:commons-jelly org.jenkins-ci:commons-jelly-tags-fmt From 79f9ebddb80c58b4a93e28b219ab0ca74738bb85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 20:48:04 -0700 Subject: [PATCH 16/16] Update Winstone and Jetty (#10958) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 98b09a005d..b80ea4b05e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ THE SOFTWARE. 1.32 false - 8.12 + 8.13 24.5.0 diff --git a/war/pom.xml b/war/pom.xml index a3fc11f644..62938836fb 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -654,7 +654,7 @@ THE SOFTWARE. contains a version of Jetty that is older than this, trigger Dependabot in jenkinsci/winstone and release the result before proceeding with the update here. --> - 12.0.24 + 12.0.25