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 diff --git a/core/pom.xml b/core/pom.xml index af4de420fd..1a2d27a939 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -117,11 +117,6 @@ THE SOFTWARE. - - com.infradna.tool - bridge-method-annotation - ${bridge-method-injector.version} - com.sun.xml.txw2 txw2 @@ -168,6 +163,11 @@ THE SOFTWARE. commons-lang commons-lang + + io.jenkins.tools + bridge-method-annotation + ${bridge-method-injector.version} + jakarta.servlet.jsp.jstl @@ -568,7 +568,7 @@ THE SOFTWARE. - com.infradna.tool + io.jenkins.tools bridge-method-injector diff --git a/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly b/core/src/main/resources/hudson/model/BooleanParameterValue/value.jelly index ba45b2262c..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/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..7c5328f667 100644 --- a/core/src/main/resources/hudson/model/StringParameterValue/value.jelly +++ b/core/src/main/resources/hudson/model/StringParameterValue/value.jelly @@ -24,10 +24,11 @@ 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. diff --git a/package.json b/package.json index ff92b0c1bd..13954e4496 100644 --- a/package.json +++ b/package.json @@ -26,17 +26,17 @@ "@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", "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/pom.xml b/pom.xml index 6eb1ba2900..b80ea4b05e 100644 --- a/pom.xml +++ b/pom.xml @@ -73,9 +73,9 @@ THE SOFTWARE. - 2.523 + 2.524 -SNAPSHOT - 2025-08-05T13:07:43Z + 2025-08-12T13:07:48Z github @@ -94,11 +94,11 @@ THE SOFTWARE. 1.35 4.13.2 - 1.31 + 1.32 false - 8.12 - 22.18.0 + 8.13 + 24.5.0 org.jenkins-ci.plugins matrix-project - 849.v0cd64ed7e531 + 856.v4c352b_3a_b_23e hpi @@ -325,7 +325,7 @@ THE SOFTWARE. org.jenkins-ci.plugins.workflow workflow-api - 1382.veca_a_efe062fa_ + 1384.vdc05a_48f535f hpi @@ -464,7 +464,7 @@ THE SOFTWARE. org.jenkins-ci.modules sshd - 3.372.v5d04a_e92d8cf + 3.374.v19b_d59ce6610 hpi @@ -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