From ec32c159e2117bda2bd550ec4c2eb7eed2e2b4a5 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 12 Aug 2023 19:54:39 -0700 Subject: [PATCH 01/42] Add Java 21 to supported Java versions (#8365) --- war/src/main/java/executable/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/src/main/java/executable/Main.java b/war/src/main/java/executable/Main.java index 0922f88a9446..1a537e46825e 100644 --- a/war/src/main/java/executable/Main.java +++ b/war/src/main/java/executable/Main.java @@ -73,7 +73,7 @@ public class Main { private static final NavigableSet SUPPORTED_JAVA_VERSIONS = - new TreeSet<>(Arrays.asList(11, 17)); + new TreeSet<>(Arrays.asList(11, 17, 21)); /** * Sets custom session cookie name. From c5b3204ce684aea661a9557d2a716a4d3d0082b7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 13 Aug 2023 08:38:03 +0100 Subject: [PATCH 02/42] Update dependency sass to v1.65.1 (#8366) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/war/package.json b/war/package.json index 8e8b4d451ebe..33d4fe84079e 100644 --- a/war/package.json +++ b/war/package.json @@ -39,7 +39,7 @@ "postcss-preset-env": "9.1.1", "postcss-scss": "4.0.6", "prettier": "3.0.1", - "sass": "1.64.2", + "sass": "1.65.1", "sass-loader": "13.3.2", "style-loader": "3.3.3", "stylelint": "15.10.2", diff --git a/war/yarn.lock b/war/yarn.lock index df621ad6ddce..5868ec9abbb3 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -4369,7 +4369,7 @@ __metadata: postcss-preset-env: 9.1.1 postcss-scss: 4.0.6 prettier: 3.0.1 - sass: 1.64.2 + sass: 1.65.1 sass-loader: 13.3.2 sortablejs: 1.15.0 style-loader: 3.3.3 @@ -6412,16 +6412,16 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.64.2": - version: 1.64.2 - resolution: "sass@npm:1.64.2" +"sass@npm:1.65.1": + version: 1.65.1 + resolution: "sass@npm:1.65.1" dependencies: chokidar: ">=3.0.0 <4.0.0" immutable: ^4.0.0 source-map-js: ">=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 43a5c9b9b3b6ba27feb5c45eba90edc437b15a30fd443f5d2623bbd59fe4a922f2a6a9990296c6a6c2b5bce7f401922c5049357415f50b745952c2d478bc5526 + checksum: 33e325fc80cd07489992e0814cd4929496f87493ffe78c423c2dbafa5746a574e6f3bde20c2a3e4ea47b16ee3d6bc5afcf1d36b405227b829d6c4c9ddcc7f8e2 languageName: node linkType: hard From 6eee0bf6dcff892512b7c2c130ac6c6eb84af079 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 19:12:21 +0100 Subject: [PATCH 03/42] Update dependency eslint to v8.47.0 (#8373) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/war/package.json b/war/package.json index 33d4fe84079e..363ea601b452 100644 --- a/war/package.json +++ b/war/package.json @@ -30,7 +30,7 @@ "clean-webpack-plugin": "4.0.0", "css-loader": "6.8.1", "css-minimizer-webpack-plugin": "5.0.1", - "eslint": "8.46.0", + "eslint": "8.47.0", "eslint-config-prettier": "9.0.0", "handlebars-loader": "1.7.3", "mini-css-extract-plugin": "2.7.6", diff --git a/war/yarn.lock b/war/yarn.lock index 5868ec9abbb3..57535318721c 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -1734,9 +1734,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.1": - version: 2.1.1 - resolution: "@eslint/eslintrc@npm:2.1.1" +"@eslint/eslintrc@npm:^2.1.2": + version: 2.1.2 + resolution: "@eslint/eslintrc@npm:2.1.2" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -1747,14 +1747,14 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: bf909ea183d27238c257a82d4ffdec38ca94b906b4b8dfae02ecbe7ecc9e5a8182ef5e469c808bb8cb4fea4750f43ac4ca7c4b4a167b6cd7e3aaacd386b2bd25 + checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 languageName: node linkType: hard -"@eslint/js@npm:^8.46.0": - version: 8.46.0 - resolution: "@eslint/js@npm:8.46.0" - checksum: 7aed479832302882faf5bec37e9d068f270f84c19b3fb529646a7c1b031e73a312f730569c78806492bc09cfce3d7651dfab4ce09a56cbb06bc6469449e56377 +"@eslint/js@npm:^8.47.0": + version: 8.47.0 + resolution: "@eslint/js@npm:8.47.0" + checksum: 0ef57fe27b6d4c305b33f3b2d2fee1ab397a619006f1d6f4ce5ee4746b8f03d11a4e098805a7d78601ca534cf72917d37f0ac19896c992a32e26299ecb9f9de1 languageName: node linkType: hard @@ -3490,21 +3490,21 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.2": - version: 3.4.2 - resolution: "eslint-visitor-keys@npm:3.4.2" - checksum: 9e0e7e4aaea705c097ae37c97410e5f167d4d2193be2edcb1f0760762ede3df01545e4820ae314f42dcec687745f2c6dcaf6d83575c4a2a241eb0c8517d724f2 +"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60 languageName: node linkType: hard -"eslint@npm:8.46.0": - version: 8.46.0 - resolution: "eslint@npm:8.46.0" +"eslint@npm:8.47.0": + version: 8.47.0 + resolution: "eslint@npm:8.47.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.1 - "@eslint/js": ^8.46.0 + "@eslint/eslintrc": ^2.1.2 + "@eslint/js": ^8.47.0 "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 @@ -3515,7 +3515,7 @@ __metadata: doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 eslint-scope: ^7.2.2 - eslint-visitor-keys: ^3.4.2 + eslint-visitor-keys: ^3.4.3 espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 @@ -3540,7 +3540,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 7a7d36b1a3bbc12e08fbb5bc36fd482a7a5a1797e62e762499dd45601b9e45aaa53a129f31ce0b4444551a9639b8b681ad535f379893dd1e3ae37b31dccd82aa + checksum: 1988617f703eadc5c7540468d54dc8e5171cf2bb9483f6172799cd1ff54a9a5e4470f003784e8cef92687eaa14de37172732787040e67817581a20bcb9c15970 languageName: node linkType: hard @@ -4356,7 +4356,7 @@ __metadata: clean-webpack-plugin: 4.0.0 css-loader: 6.8.1 css-minimizer-webpack-plugin: 5.0.1 - eslint: 8.46.0 + eslint: 8.47.0 eslint-config-prettier: 9.0.0 handlebars: 4.7.8 handlebars-loader: 1.7.3 From ac31b400ee42c639183ab9b047221ba8a8465094 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:07:52 -0700 Subject: [PATCH 04/42] Bump org.jenkins-ci.plugins:matrix-project from 802.v8013b_40c7edc to 808.v5a_b_5f56d6966 (#8374) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 ecf8f7ecbbaf..7b732486561a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -215,7 +215,7 @@ THE SOFTWARE. org.jenkins-ci.plugins matrix-project - 802.v8013b_40c7edc + 808.v5a_b_5f56d6966 test From 8ef741e10a9e511ff716b0a9726680e514653327 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:08:46 -0700 Subject: [PATCH 05/42] Update jenkins/ath Docker tag to v5695 (#8369) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- ath.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ath.sh b/ath.sh index 7cea1919f4ae..d4d0c0e3f85a 100644 --- a/ath.sh +++ b/ath.sh @@ -6,7 +6,7 @@ set -o xtrace cd "$(dirname "$0")" # https://github.com/jenkinsci/acceptance-test-harness/releases -export ATH_VERSION=5691.v64cd2e005b_8b_ +export ATH_VERSION=5695.ve1f0439c5a_51 if [[ $# -eq 0 ]]; then export JDK=17 From 23139f7b1be9e20b1bcaa76416327163a3ea591a Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 12:57:57 +0000 Subject: [PATCH 06/42] [maven-release-plugin] prepare release jenkins-2.419 --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 4 ++-- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty10/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 537d08f11a36..9e163a4c80b5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 56560342e5f4..1875ba6a3d67 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 cli diff --git a/core/pom.xml b/core/pom.xml index 26f9a102c81e..8f17cced7958 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 9f27c8d11cf0..eb05804382b9 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 jenkins-coverage diff --git a/pom.xml b/pom.xml index bb4fefcbc318..f81770ea5da2 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 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.419 https://github.com/jenkinsci/jenkins diff --git a/test/pom.xml b/test/pom.xml index 7b732486561a..1bf7c9bc957d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 963a3b0d50fc..e6467348e195 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index eb4a169a59d1..516deca58f73 100644 --- a/websocket/jetty10/pom.xml +++ b/websocket/jetty10/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.419 ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 77abcc3b7248..04d62fa6e6d0 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.419 ../.. From ecac913d5ce023fcda7c4cb79d101ae9489bbe08 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 12:58:08 +0000 Subject: [PATCH 07/42] [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 | 6 +++--- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty10/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 9e163a4c80b5..537d08f11a36 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 1875ba6a3d67..56560342e5f4 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index 8f17cced7958..26f9a102c81e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index eb05804382b9..9f27c8d11cf0 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} jenkins-coverage diff --git a/pom.xml b/pom.xml index f81770ea5da2..078ae5d1a9de 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.419 + ${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.419 + ${scmTag} https://github.com/jenkinsci/jenkins @@ -73,7 +73,7 @@ THE SOFTWARE. - 2.419 + 2.420 -SNAPSHOT diff --git a/test/pom.xml b/test/pom.xml index 1bf7c9bc957d..7b732486561a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} jenkins-test diff --git a/war/pom.xml b/war/pom.xml index e6467348e195..963a3b0d50fc 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index 516deca58f73..eb4a169a59d1 100644 --- a/websocket/jetty10/pom.xml +++ b/websocket/jetty10/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 04d62fa6e6d0..77abcc3b7248 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.419 + ${revision}${changelist} ../.. From dfb83f6d158638ba64282cbd57d5d5decbeeee15 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:37:55 +0100 Subject: [PATCH 08/42] Deprecate `findAncestor` and `findAncestorClass` (#8357) --- .../main/resources/lib/form/apply/apply.js | 2 +- .../lib/form/radioBlock/radioBlock.js | 2 +- .../lib/form/repeatable/repeatable.js | 2 +- .../main/webapp/scripts/hudson-behavior.js | 20 +++++++++++++------ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/core/src/main/resources/lib/form/apply/apply.js b/core/src/main/resources/lib/form/apply/apply.js index d67d9306173d..c79c9ce7dbcf 100644 --- a/core/src/main/resources/lib/form/apply/apply.js +++ b/core/src/main/resources/lib/form/apply/apply.js @@ -29,7 +29,7 @@ Behaviour.specify( } e.addEventListener("click", function (e) { - var f = findAncestor(e.target, "FORM"); + var f = e.target.closest("FORM"); // create a throw-away IFRAME to avoid back button from loading the POST result back id = "iframe" + iota++; diff --git a/core/src/main/resources/lib/form/radioBlock/radioBlock.js b/core/src/main/resources/lib/form/radioBlock/radioBlock.js index b504ddeb0d54..4620e5b3bc05 100644 --- a/core/src/main/resources/lib/form/radioBlock/radioBlock.js +++ b/core/src/main/resources/lib/form/radioBlock/radioBlock.js @@ -55,7 +55,7 @@ Behaviour.specify( g.buttons = []; } - var s = findAncestorClass(r, "radio-block-start"); + var s = r.closest(".radio-block-start"); s.setAttribute("ref", r.id); // find the end node diff --git a/core/src/main/resources/lib/form/repeatable/repeatable.js b/core/src/main/resources/lib/form/repeatable/repeatable.js index b72ef304a037..89f2d57b12d6 100644 --- a/core/src/main/resources/lib/form/repeatable/repeatable.js +++ b/core/src/main/resources/lib/form/repeatable/repeatable.js @@ -125,7 +125,7 @@ var repeatableSupport = { // called when 'delete' button is clicked onDelete: function (n) { - n = findAncestorClass(n, "repeated-chunk"); + n = n.closest(".repeated-chunk"); var a = new YAHOO.util.Anim( n, { diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index dc9c0a5605fe..e3ecebc5c934 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -438,12 +438,21 @@ function qs(owner) { }; } -// find the nearest ancestor node that has the given tag name +// @deprecated Use standard javascript method `e.closest(tagName)` instead +// eslint-disable-next-line no-unused-vars function findAncestor(e, tagName) { + console.warn( + "Deprecated call to findAncestor - use standard javascript method `e.closest(tagName)` instead", + ); return e.closest(tagName); } +// @deprecated Use standard javascript method `e.closest(className)` instead +// eslint-disable-next-line no-unused-vars function findAncestorClass(e, cssClass) { + console.warn( + "Deprecated call to findAncestorClass - use standard javascript method `e.closest(className)` instead", + ); return e.closest("." + cssClass); } @@ -2023,10 +2032,9 @@ function updateOptionalBlock(c) { // Hack to hide tool home when "Install automatically" is checked. var homeField = findPreviousFormItem(c, "home"); if (homeField != null && homeField.value == "") { - var tr = - findAncestor(homeField, "TR") || findAncestorClass(homeField, "tr"); - if (tr != null) { - tr.style.display = c.checked ? "none" : ""; + const formItem = homeField.closest(".jenkins-form-item"); + if (formItem != null) { + formItem.style.display = c.checked ? "none" : ""; layoutUpdateCallback.call(); } } @@ -2443,7 +2451,7 @@ function findFormParent(e, form, isStatic) { if (form == null) { // caller can pass in null to have this method compute the owning form - form = findAncestor(e, "FORM"); + form = e.closest("FORM"); } while (e != form) { From 6e3b742ce8222099510ca3f472b4e162828c179a Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:38:09 +0100 Subject: [PATCH 09/42] Remove the addition of the 'has-help' class from `hudson-behaviour.js` (#8355) --- war/src/main/webapp/scripts/hudson-behavior.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index e3ecebc5c934..258dfbdf395a 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1381,7 +1381,6 @@ function rowvgStartEachRow(recursive, f) { function (e) { e.onclick = helpButtonOnClick; e.tabIndex = 9999; // make help link unnavigable from keyboard - e.parentNode.parentNode.classList.add("has-help"); }, ); @@ -1389,7 +1388,6 @@ function rowvgStartEachRow(recursive, f) { Behaviour.specify("A.help-button", "a-help-button", ++p, function (e) { e.onclick = helpButtonOnClick; e.tabIndex = 9999; // make help link unnavigable from keyboard - e.parentNode.parentNode.classList.add("has-help"); }); // Script Console : settings and shortcut key From a8a144d72a1b71fbc4646eae547b44adeabe84b4 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:38:20 +0100 Subject: [PATCH 10/42] Update the design of the content blocks (#8363) Co-authored-by: Tim Jacomb Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- .../hudson/model/AllView/noJob.groovy | 22 ++---- .../resources/hudson/model/View/main.groovy | 2 +- .../jenkins/agents/CloudSet/index.jelly | 8 +- war/src/main/scss/abstracts/mixins.scss | 4 + war/src/main/scss/modules/content-blocks.scss | 77 ++++++------------- 5 files changed, 38 insertions(+), 75 deletions(-) diff --git a/core/src/main/resources/hudson/model/AllView/noJob.groovy b/core/src/main/resources/hudson/model/AllView/noJob.groovy index 6f5a7adeab68..6daf221b403e 100644 --- a/core/src/main/resources/hudson/model/AllView/noJob.groovy +++ b/core/src/main/resources/hudson/model/AllView/noJob.groovy @@ -31,9 +31,7 @@ div { a(href: "newJob", class: "content-block__link") { span(_("createJob")) span(class: "trailing-icon") { - l.icon( - class: "icon-md", - src: "symbol-arrow-right") + l.icon(src: "symbol-add") } } } @@ -48,9 +46,7 @@ div { a(href: "computer/new", class: "content-block__link") { span(_("setUpAgent")) span(class: "trailing-icon") { - l.icon( - class: "icon-md", - src: "symbol-arrow-right") + l.icon(src: "symbol-computer") } } } @@ -60,9 +56,7 @@ div { a(href: "cloud/", class: "content-block__link") { span(_("setUpCloud")) span(class: "trailing-icon") { - l.icon( - class: "icon-md", - src: "symbol-arrow-right") + l.icon(src: "symbol-cloud") } } } @@ -71,12 +65,10 @@ div { li(class: "content-block") { a(href: "https://www.jenkins.io/redirect/distributed-builds", target: "_blank", - class: "content-block__link content-block__help-link") { + class: "content-block__link") { span(_("learnMoreDistributedBuilds")) span(class: "trailing-icon") { - l.icon( - class: "icon-md", - src: "symbol-link") + l.icon(src: "symbol-help-circle") } } } @@ -96,9 +88,7 @@ div { a(href: "newJob", class: "content-block__link") { span(_("createJob")) span(class: "trailing-icon") { - l.icon( - class: "icon-md", - src: "symbol-arrow-right") + l.icon(src: "symbol-add") } } } diff --git a/core/src/main/resources/hudson/model/View/main.groovy b/core/src/main/resources/hudson/model/View/main.groovy index d01d2c734190..58a9ec86d864 100644 --- a/core/src/main/resources/hudson/model/View/main.groovy +++ b/core/src/main/resources/hudson/model/View/main.groovy @@ -22,4 +22,4 @@ if (items == null) { include(my.owner.viewsTabBar,"viewTabs") } } -} \ No newline at end of file +} diff --git a/core/src/main/resources/jenkins/agents/CloudSet/index.jelly b/core/src/main/resources/jenkins/agents/CloudSet/index.jelly index 7678b5251326..3062c25ad01d 100644 --- a/core/src/main/resources/jenkins/agents/CloudSet/index.jelly +++ b/core/src/main/resources/jenkins/agents/CloudSet/index.jelly @@ -90,7 +90,7 @@ THE SOFTWARE. class="content-block__link"> ${%newCloud} - + @@ -100,17 +100,17 @@ THE SOFTWARE. class="content-block__link"> ${%installCloudPlugin} - +
  • ${%learnMoreDistributedBuilds} - +
    • diff --git a/war/src/main/scss/abstracts/mixins.scss b/war/src/main/scss/abstracts/mixins.scss index 3ad87b9163b1..37060d09d19e 100644 --- a/war/src/main/scss/abstracts/mixins.scss +++ b/war/src/main/scss/abstracts/mixins.scss @@ -70,6 +70,10 @@ box-shadow: 0 0 0 0.66rem transparent; } + &:focus-visible { + outline: none; + } + &:not(:disabled) { &:hover, &:focus-visible { diff --git a/war/src/main/scss/modules/content-blocks.scss b/war/src/main/scss/modules/content-blocks.scss index 1832f1499f0c..a82722a7a2d2 100644 --- a/war/src/main/scss/modules/content-blocks.scss +++ b/war/src/main/scss/modules/content-blocks.scss @@ -1,81 +1,50 @@ @use "../abstracts/mixins"; -.content-block { - border-radius: 4px; - border: 2px solid var(--light-grey); -} - -.content-block__body { - padding: 1.5rem; -} - -.content-block__body > *:first-child { - margin-top: 0; -} - -.content-block__body > *:last-child { - margin-bottom: 0; -} - -.content-block__footer { - background-color: var(--light-grey); - padding: 0.5rem 1.5rem; -} - -.content-block__link-list { - padding: 0; -} - -.content-block__link-list li { - list-style: none; - width: 100%; - - &:not(:last-child) { - margin-bottom: 0.75rem; - } -} - .content-block__link { - padding: 0.5rem 1rem; + @include mixins.item; + display: flex; justify-content: space-between; - background-color: var(--light-grey); - - @include mixins.link-dark; - - &:focus { - outline-color: var(--focus); + align-items: center; + padding: 0.75rem 1.1rem; + color: var(--text-color) !important; + font-weight: 500; + text-decoration: none !important; + + &::before { + background: var(--button-background); } - .trailing-icon .svg-icon { - &.icon-sm { - height: 1.25rem; + .trailing-icon { + display: flex; + justify-content: center; + align-items: center; + width: 1.25rem; + height: 1.25rem; + + svg { width: 1.25rem; + height: 1.25rem; } } } -.content-block__help-link { - background-color: var(--white); -} - -// Empty state specific blocks - .empty-state-block { max-width: 600px; margin: 0 auto; - margin-top: 1.5rem; } .empty-state-section { - margin-top: 2rem; + margin-top: var(--section-padding); } .empty-state-section-list { + display: flex; + flex-direction: column; + gap: 0.625rem; padding: 0; li { list-style: none; - margin-bottom: 1rem; } } From 83085bac0081f7366abf9c74616b1b1a9ad62bb3 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:38:32 +0100 Subject: [PATCH 11/42] Display a notice when there are plugins installed or updates available (#8208) Co-authored-by: Alexander Brandes Co-authored-by: Alexander Brandes Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- .../hudson/PluginManager/_installed.js | 4 +- .../hudson/PluginManager/installed.jelly | 47 ++- .../hudson/PluginManager/updates.jelly | 341 +++++++++--------- .../jenkins/model/Jenkins/systemInfo.jelly | 37 +- .../resources/lib/layout/search-bar.jelly | 8 +- .../resources/images/symbols/up-to-date.svg | 1 + war/src/main/scss/form/search-bar.scss | 45 ++- 7 files changed, 244 insertions(+), 239 deletions(-) create mode 100644 war/src/main/resources/images/symbols/up-to-date.svg diff --git a/core/src/main/resources/hudson/PluginManager/_installed.js b/core/src/main/resources/hudson/PluginManager/_installed.js index e3712b850818..4b1018a24ce5 100644 --- a/core/src/main/resources/hudson/PluginManager/_installed.js +++ b/core/src/main/resources/hudson/PluginManager/_installed.js @@ -36,9 +36,7 @@ function updateMsg() { // has anything changed since its original state? let e = Array.from( - document - .getElementById("plugins") - .querySelectorAll("input[type='checkbox']"), + document.querySelectorAll("#plugins input[type='checkbox']"), ).find(function (e) { return String(e.checked) !== e.getAttribute("original"); }); diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index 9319b7acbe2e..b312e0f680f1 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -36,13 +36,17 @@ THE SOFTWARE. + +
    + value="${request.getParameter('filter')}" + enabled="${!noPlugins}" />
    @@ -67,29 +71,20 @@ THE SOFTWARE. data-detached-possible-dependents="${%detached-possible-dependents}" data-uninstall-description="${%uninstall-description}" /> - - - - - - - - - - - - - - - + + + + + +
    ${%Installed plugins}
    ${%No plugins installed.}
    - - - - - + + + + + @@ -274,9 +269,9 @@ THE SOFTWARE. - - -
    ${%Name}${%Enabled} - -
    ${%Name}${%Enabled} + +
    + + +
    @@ -63,183 +64,177 @@ THE SOFTWARE. - - - - - - - - - - - - - - - - - + + +
    - - - - - - ${%Name}${%Released}${%Installed}
    + + - + - + + + + + + + + + + + + - - - - - - - - - - - -
    - - - - + + + + + + - - -
    - - - - ${app.updateCenter.getCategoryDisplayName(label)} - - - -
    -     - -
    - -
    -     - -
    ${%compatWarning} - -
    ${%parentCompatWarning} -
    		${%Name}${%Released}${%Installed}
    + + + + + + +
    + + + + ${app.updateCenter.getCategoryDisplayName(label)} - + - +
    - - - -
    ${%coreWarning(p.requiredCore)}
    -     - -
    - ${%Applying this update will address security vulnerabilities in the currently installed version.} -
    -     - -
    ${%depCompatWarning} -
    ${%parentDepCompatWarning} - -
    -     - -
    - ${%depCoreWarning(p.getNeededDependenciesRequiredCore().toString())} -
    -     - -
    ${%securityWarning} - -
    -     - -
    - ${%deprecationWarning(p.getDeprecation().url)} -
    -     - -
    - ${%adoptThisPlugin} -
    -     -     		- - - - - - - - - - - () - - - -
    -
    - ${%No updates} -
    -
    + +
    + +
    +     + +
    ${%compatWarning} + +
    ${%parentCompatWarning} + +     +
    +     + +
    ${%coreWarning(p.requiredCore)}
    +     + +
    + ${%Applying this update will address security vulnerabilities in the currently installed version.} +
    +     + +
    ${%depCompatWarning} +
    ${%parentDepCompatWarning} + +
    +     + +
    + ${%depCoreWarning(p.getNeededDependenciesRequiredCore().toString())} +
    +     + +
    ${%securityWarning} + +
    +     + +
    + ${%deprecationWarning(p.getDeprecation().url)} +
    +     + +
    + ${%adoptThisPlugin} +
    +     + + + + + + + + + + + + + + () + + + + + + + + + + + + diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly index f9b6d5547b9e..554215da00c3 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly +++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo.jelly @@ -50,24 +50,21 @@ THE SOFTWARE. - - - - - - - - - - - + + + + + + +
    ${%Name}${%Version}${%Enabled}
    + - + + + - - + + @@ -84,10 +81,10 @@ THE SOFTWARE. - - - -
    - ${%No plugins installed.} - ${%Name}${%Version}${%Enabled}
    + + + +     diff --git a/core/src/main/resources/lib/layout/search-bar.jelly b/core/src/main/resources/lib/layout/search-bar.jelly index ac66f88a20a9..b86a15fef0d6 100644 --- a/core/src/main/resources/lib/layout/search-bar.jelly +++ b/core/src/main/resources/lib/layout/search-bar.jelly @@ -33,13 +33,16 @@ THE SOFTWARE. If false the default keyboard shortcut for the input is disabled. Defaults to true. + + Defaults to true. Sets whether the search bar is enabled or not. + Creates a search input @since 2.369
    -
    +
    @@ -52,7 +55,8 @@ THE SOFTWARE. autocomplete="off" autocorrect="off" autocapitalize="off" - spellcheck="false" /> + spellcheck="false" + disabled="${attrs.enabled == false ? true : null}" />
    diff --git a/war/src/main/resources/images/symbols/up-to-date.svg b/war/src/main/resources/images/symbols/up-to-date.svg new file mode 100644 index 000000000000..406ad9cb0b85 --- /dev/null +++ b/war/src/main/resources/images/symbols/up-to-date.svg @@ -0,0 +1 @@ + diff --git a/war/src/main/scss/form/search-bar.scss b/war/src/main/scss/form/search-bar.scss index 19b76ff6fed1..9fcc47b862c4 100644 --- a/war/src/main/scss/form/search-bar.scss +++ b/war/src/main/scss/form/search-bar.scss @@ -58,24 +58,30 @@ } } - &:hover { - background: var(--item-background--active); - } + &:not(:disabled) { + &:hover { + background: var(--item-background--active); + } - &:active, - &:focus { - outline: none; - background: var(--item-background--active); - box-shadow: - 0 0 0 2px var(--focus-input-border), - 0 0 0 7px var(--focus-input-glow); - - &::-webkit-search-cancel-button { - opacity: 0.5; - pointer-events: all; - transform: scale(1); + &:active, + &:focus { + outline: none; + background: var(--item-background--active); + box-shadow: + 0 0 0 2px var(--focus-input-border), + 0 0 0 7px var(--focus-input-glow); + + &::-webkit-search-cancel-button { + opacity: 0.5; + pointer-events: all; + transform: scale(1); + } } } + + &:disabled { + cursor: not-allowed; + } } &__icon { @@ -212,6 +218,15 @@ pointer-events: none; } } + + &--disabled { + color: var(--text-color-secondary); + opacity: 0.5; + + .jenkins-search__shortcut { + display: none; + } + } } .jenkins-search__results-container { From 20bbae6be4c663a1c2459e36a98f048136185a56 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 20:00:16 +0200 Subject: [PATCH 12/42] Update jenkins/ath Docker tag to v5699 (#8377) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- ath.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ath.sh b/ath.sh index d4d0c0e3f85a..9edfd5f27495 100644 --- a/ath.sh +++ b/ath.sh @@ -6,7 +6,7 @@ set -o xtrace cd "$(dirname "$0")" # https://github.com/jenkinsci/acceptance-test-harness/releases -export ATH_VERSION=5695.ve1f0439c5a_51 +export ATH_VERSION=5699.v27deb_ef5796c if [[ $# -eq 0 ]]; then export JDK=17 From 4433a12d1af550eea6fc47d200f11065570e6fe3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 14:28:54 -0700 Subject: [PATCH 13/42] Bump org.jenkins-ci.plugins:cloudbees-folder from 6.846.v23698686f0f6 to 6.848.ve3b_fd7839a_81 (#8383) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 7b732486561a..10c16e508474 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -185,7 +185,7 @@ THE SOFTWARE. org.jenkins-ci.plugins cloudbees-folder - 6.846.v23698686f0f6 + 6.848.ve3b_fd7839a_81 test From 0b37bcb5f176b2fce1a69c36910a7b145fe99ba8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Aug 2023 14:29:41 -0700 Subject: [PATCH 14/42] Bump org.jenkins-ci.plugins:script-security from 1264.vecf66020eb_7d to 1269.v639888f5e366 (#8384) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 10c16e508474..f47fab8029de 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -101,7 +101,7 @@ THE SOFTWARE. org.jenkins-ci.plugins script-security - 1264.vecf66020eb_7d + 1269.v639888f5e366 From 97ac833176cda87486d7f1211f0fe0f0a68beb71 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 17 Aug 2023 18:00:23 +0100 Subject: [PATCH 15/42] Update link design (#8375) Co-authored-by: Alexander Brandes --- war/src/main/scss/abstracts/mixins.scss | 10 +++++++++ war/src/main/scss/abstracts/theme.scss | 2 +- war/src/main/scss/base/style.scss | 28 ------------------------- war/src/main/scss/base/typography.scss | 18 ++++++++++++++++ 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/war/src/main/scss/abstracts/mixins.scss b/war/src/main/scss/abstracts/mixins.scss index 37060d09d19e..63a963f698c6 100644 --- a/war/src/main/scss/abstracts/mixins.scss +++ b/war/src/main/scss/abstracts/mixins.scss @@ -1,6 +1,8 @@ @mixin link { text-decoration: var(--link-text-decoration); font-weight: var(--link-font-weight); + text-underline-offset: 2px; + text-decoration-thickness: 2px; &:link { color: var(--link-color); @@ -20,6 +22,14 @@ color: var(--link-color--active); text-decoration: var(--link-text-decoration--active); } + + @media (prefers-contrast: more) { + text-decoration: underline; + + &:hover { + text-decoration-thickness: 3px; + } + } } @mixin link-dark { diff --git a/war/src/main/scss/abstracts/theme.scss b/war/src/main/scss/abstracts/theme.scss index be48ffd9d74d..c2bb35014d07 100644 --- a/war/src/main/scss/abstracts/theme.scss +++ b/war/src/main/scss/abstracts/theme.scss @@ -183,7 +183,7 @@ $semantics: ( --link-text-decoration: none; --link-text-decoration--hover: underline; --link-text-decoration--active: underline; - --link-font-weight: 600; + --link-font-weight: 500; // Tooltips --tooltip-backdrop-filter: contrast(0.6) brightness(2.4) saturate(2) diff --git a/war/src/main/scss/base/style.scss b/war/src/main/scss/base/style.scss index 647844da6a2e..22acd9884ee4 100644 --- a/war/src/main/scss/base/style.scss +++ b/war/src/main/scss/base/style.scss @@ -1,5 +1,3 @@ -@use "../abstracts/mixins"; - /* * The MIT License * @@ -116,27 +114,6 @@ td.no-wrap { color: #ccc; } */ -a { - @include mixins.link; -} - -.jenkins-link--with-icon { - display: inline-flex; - align-items: center; - justify-content: flex-start; - - svg { - width: 16px; - height: 16px; - flex: 0 0 auto; - color: var(--text-color) !important; - } -} - -p a { - text-decoration: underline; -} - a.lowkey:link { text-decoration: none; color: inherit; @@ -239,7 +216,6 @@ pre { line-height: 1.66; a { - font-weight: inherit; word-wrap: break-word; } } @@ -560,10 +536,6 @@ pre.console { } } -.help a { - text-decoration: underline; -} - .help .from-plugin { text-align: right; color: #666; diff --git a/war/src/main/scss/base/typography.scss b/war/src/main/scss/base/typography.scss index d8ecfa61efb8..2b35478325fa 100644 --- a/war/src/main/scss/base/typography.scss +++ b/war/src/main/scss/base/typography.scss @@ -1,3 +1,5 @@ +@use "../abstracts/mixins"; + body, p { font-family: var(--font-family-sans); @@ -96,3 +98,19 @@ h6, opacity: 0.7; } } + +a { + @include mixins.link; +} + +.jenkins-link--with-icon { + display: inline-flex; + align-items: center; + justify-content: flex-start; + + svg { + width: 16px; + height: 16px; + color: var(--text-color) !important; + } +} From 29bc5f747262065126e347abaf18f187d7e2fe32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 17:33:51 -0700 Subject: [PATCH 16/42] Bump org.jenkins-ci.plugins:structs from 324.va_f5d6774f3a_d to 325.vcb_307d2a_2782 (#8389) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 f47fab8029de..11a2057e69ab 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -221,7 +221,7 @@ THE SOFTWARE. org.jenkins-ci.plugins structs - 324.va_f5d6774f3a_d + 325.vcb_307d2a_2782 test From 5c723b667310fd4b562e3ad3db8d2c67f989addb Mon Sep 17 00:00:00 2001 From: Mustafa Ulu Date: Fri, 18 Aug 2023 17:35:07 +0300 Subject: [PATCH 17/42] Turkish localization fixes for the job configuration page (#8368) --- .../main/resources/hudson/model/Job/configure_tr.properties | 4 ++++ core/src/main/resources/hudson/model/Messages_tr.properties | 4 ++-- core/src/main/resources/jenkins/model/Messages_tr.properties | 2 +- .../main/resources/jenkins/triggers/Messages_tr.properties | 1 + .../lib/hudson/project/config-builders_tr.properties | 1 + .../lib/hudson/project/config-concurrentBuild_tr.properties | 2 +- .../lib/hudson/project/config-disableBuild_tr.properties | 3 +++ .../lib/hudson/project/config-publishers2_tr.properties | 3 ++- .../lib/hudson/project/config-publishers_tr.properties | 2 +- .../resources/lib/hudson/project/makeDisabled_tr.properties | 3 ++- 10 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 core/src/main/resources/jenkins/triggers/Messages_tr.properties diff --git a/core/src/main/resources/hudson/model/Job/configure_tr.properties b/core/src/main/resources/hudson/model/Job/configure_tr.properties index 478b231c0282..dbd3cbfc3dd8 100644 --- a/core/src/main/resources/hudson/model/Job/configure_tr.properties +++ b/core/src/main/resources/hudson/model/Job/configure_tr.properties @@ -24,4 +24,8 @@ Strategy=Strateji name={0} isim Description=Açıklama LOADING=YÜKLENİYOR +Configuration=Konfigürasyon +Configure=Konfigürasyonu Düzenle +General=Genel Save=Kaydet +Apply=Uygula diff --git a/core/src/main/resources/hudson/model/Messages_tr.properties b/core/src/main/resources/hudson/model/Messages_tr.properties index fbf4917f3fb3..d7356b3d3fe7 100644 --- a/core/src/main/resources/hudson/model/Messages_tr.properties +++ b/core/src/main/resources/hudson/model/Messages_tr.properties @@ -101,11 +101,11 @@ Run.UnableToDelete={0} silinemiyor: {1} View.Permissions.Title=Görüntü Permalink.LastBuild=Son yapılandırma -Permalink.LastStableBuild=Son stabil yapılandırma +Permalink.LastStableBuild=Son kararlı yapılandırma Permalink.LastSuccessfulBuild=Son başarılı yapılandırma Permalink.LastFailedBuild=Son başarısız yapılandırma ManageJenkinsAction.DisplayName=Jenkins''i Yönet -ParametersDefinitionProperty.DisplayName=Bu yapılandırma parametreleştirilmiştir. +ParametersDefinitionProperty.DisplayName=Bu projeyi parametrik hale getir ManagementLink.Category.CONFIGURATION=Sistem Konfigürasyonu ManagementLink.Category.SECURITY=Güvenlik diff --git a/core/src/main/resources/jenkins/model/Messages_tr.properties b/core/src/main/resources/jenkins/model/Messages_tr.properties index f3108bf971ec..ea0bb121c326 100644 --- a/core/src/main/resources/jenkins/model/Messages_tr.properties +++ b/core/src/main/resources/jenkins/model/Messages_tr.properties @@ -33,4 +33,4 @@ Hudson.ViewName=Hepsi ParameterizedJobMixIn.build_now=Şimdi Yapılandır BlockedBecauseOfBuildInProgress.shortDescription=Yapılandırma #{0} zaten işlemde {1} BlockedBecauseOfBuildInProgress.ETA=\ (ETA: {0}) -BuildDiscarderProperty.displayName=Eski Yapılandırmalardan Kurtul +BuildDiscarderProperty.displayName=Eski yapılandırmalardan kurtul diff --git a/core/src/main/resources/jenkins/triggers/Messages_tr.properties b/core/src/main/resources/jenkins/triggers/Messages_tr.properties new file mode 100644 index 000000000000..9f075b4628ae --- /dev/null +++ b/core/src/main/resources/jenkins/triggers/Messages_tr.properties @@ -0,0 +1 @@ +ReverseBuildTrigger.build_after_other_projects_are_built=Başka projeler yapılandırıldıktan sonra yapılandırma tetikle diff --git a/core/src/main/resources/lib/hudson/project/config-builders_tr.properties b/core/src/main/resources/lib/hudson/project/config-builders_tr.properties index 4a9473f35148..0164548aeaba 100644 --- a/core/src/main/resources/lib/hudson/project/config-builders_tr.properties +++ b/core/src/main/resources/lib/hudson/project/config-builders_tr.properties @@ -21,4 +21,5 @@ # THE SOFTWARE. Build=Yapılandırma +Build\ Steps=Yapılandırma Adımları Add\ build\ step=Yapılandırma adımı ekle diff --git a/core/src/main/resources/lib/hudson/project/config-concurrentBuild_tr.properties b/core/src/main/resources/lib/hudson/project/config-concurrentBuild_tr.properties index 9f65dcded217..8e01433317f8 100644 --- a/core/src/main/resources/lib/hudson/project/config-concurrentBuild_tr.properties +++ b/core/src/main/resources/lib/hudson/project/config-concurrentBuild_tr.properties @@ -1,3 +1,3 @@ # This file is under the MIT License by authors -title.concurrentbuilds=Eğer gerekliyse eş zamanlı yaplandırmaları çalıştır +title.concurrentbuilds=Gerekirse yaplandırmaları eşzamanlı çalıştır diff --git a/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties b/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties index 7503a2947110..f879e6502115 100644 --- a/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties +++ b/core/src/main/resources/lib/hudson/project/config-disableBuild_tr.properties @@ -22,3 +22,6 @@ Disable\ this\ project=Yapılandırmayı devre dışı bırak No\ new\ builds\ will\ be\ executed\ until\ the\ project\ is\ re-enabled.=Proje yeniden devreye alınana kadar yeni yapılandırma çalıştırılmayacaktır. +Enabled=Etkin +Disabled=Devre Dışı +Enable\ or\ disable\ the\ current\ project=Bu projeyi etkinleştir veya devre dışı bırak diff --git a/core/src/main/resources/lib/hudson/project/config-publishers2_tr.properties b/core/src/main/resources/lib/hudson/project/config-publishers2_tr.properties index 62d71e587eb2..d674ffa65745 100644 --- a/core/src/main/resources/lib/hudson/project/config-publishers2_tr.properties +++ b/core/src/main/resources/lib/hudson/project/config-publishers2_tr.properties @@ -20,4 +20,5 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Post-build\ Actions=Yapılandırma-sonrası Aksiyonlar +Post-build\ Actions=Yapılandırma Sonrası Aksiyonlar +Add\ post-build\ action=Yapılandırma sonrası aksiyonu ekle diff --git a/core/src/main/resources/lib/hudson/project/config-publishers_tr.properties b/core/src/main/resources/lib/hudson/project/config-publishers_tr.properties index 62d71e587eb2..0ebb2a0a5cca 100644 --- a/core/src/main/resources/lib/hudson/project/config-publishers_tr.properties +++ b/core/src/main/resources/lib/hudson/project/config-publishers_tr.properties @@ -20,4 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Post-build\ Actions=Yapılandırma-sonrası Aksiyonlar +Post-build\ Actions=Yapılandırma Sonrası Aksiyonlar diff --git a/core/src/main/resources/lib/hudson/project/makeDisabled_tr.properties b/core/src/main/resources/lib/hudson/project/makeDisabled_tr.properties index 12685be25f23..f13c9b783140 100644 --- a/core/src/main/resources/lib/hudson/project/makeDisabled_tr.properties +++ b/core/src/main/resources/lib/hudson/project/makeDisabled_tr.properties @@ -20,5 +20,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Disable\ Project=Projeyi devre dışı bırak +Disable\ Project=Projeyi Devre Dışı Bırak This\ project\ is\ currently\ disabled=Bu proje şimdilik devre dışı +Enable=Etkinleştir From 9d9041713ad87dafbe8be286e78ab2768d320047 Mon Sep 17 00:00:00 2001 From: Yaroslav <91559310+yaroslavafenkin@users.noreply.github.com> Date: Fri, 18 Aug 2023 17:35:53 +0300 Subject: [PATCH 18/42] [JENKINS-71514] Remove `eval` call in hudson-behavior.js (#8370) Co-authored-by: Yaroslav Afenkin --- war/src/main/webapp/scripts/hudson-behavior.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index 258dfbdf395a..4197fa903207 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1395,14 +1395,12 @@ function rowvgStartEachRow(recursive, f) { (function () { var cmdKeyDown = false; var mode = e.getAttribute("script-mode") || "text/x-groovy"; - var readOnly = eval(e.getAttribute("script-readOnly")) || false; // eslint-disable-next-line no-unused-vars var w = CodeMirror.fromTextArea(e, { mode: mode, lineNumbers: true, matchBrackets: true, - readOnly: readOnly, onKeyEvent: function (editor, event) { function saveAndSubmit() { editor.save(); From 02fbe762ad62aa5c52cfd148cff3fdfc5186001c Mon Sep 17 00:00:00 2001 From: Mysterious_Dev <40738104+Mysterious-Dev@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:36:16 +0200 Subject: [PATCH 19/42] Many French translations for plugin panels (#8382) Co-authored-by: Olivier Lamy --- .../resources/hudson/Messages_fr.properties | 2 ++ .../PluginManager/sidepanel_fr.properties | 27 +++++++++++++++++++ .../model/UpdateCenter/index_fr.properties | 6 +---- 3 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 core/src/main/resources/hudson/PluginManager/sidepanel_fr.properties diff --git a/core/src/main/resources/hudson/Messages_fr.properties b/core/src/main/resources/hudson/Messages_fr.properties index 1c948734def7..543ae2f0dcba 100644 --- a/core/src/main/resources/hudson/Messages_fr.properties +++ b/core/src/main/resources/hudson/Messages_fr.properties @@ -49,6 +49,8 @@ Util.day ={0} j Util.month ={0} mo. Util.year ={0} an. +UpdateCenter.DownloadButNotActivated=La mise à jour a été téléchargée avec succès. Elle sera activée lors du prochain démarrage + FilePath.TildaDoesntWork=''~'' n''est supporté que sur les shells Unix. PluginManager.PortNotANumber=Le port n''est pas un nombre diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel_fr.properties b/core/src/main/resources/hudson/PluginManager/sidepanel_fr.properties new file mode 100644 index 000000000000..c2f09529615c --- /dev/null +++ b/core/src/main/resources/hudson/PluginManager/sidepanel_fr.properties @@ -0,0 +1,27 @@ +# The MIT License +# +# Copyright (c) 2023, Damian Szczepanik +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +Updates=Mises à jour +Available\ plugins=Plugins disponibles +Installed\ plugins=Plugins installés +Advanced\ settings=Paramètres avancés +Download\ progress=Progression des téléchargements diff --git a/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties b/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties index d4484e9b7c4c..2a47892a3281 100644 --- a/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties +++ b/core/src/main/resources/hudson/model/UpdateCenter/index_fr.properties @@ -20,8 +20,4 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -Update\ Center=Centre de mise à jour -warning=Une fois l''installation terminée, Jenkins doit être redémarré \ - pour prendre en compte les nouveaux plugins. -Installing\ Plugins/Upgrades=Installation/Mise à jour des Plugins -Schedule\ Restart=Programmer un redémarrage +Download\ progress=Progression du téléchargement From 4ef934e4c46a7a434863d160696a6f1474e564e6 Mon Sep 17 00:00:00 2001 From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:36:45 +0200 Subject: [PATCH 20/42] [JENKINS-71833] Fix link to job in slow trigger admin monitor (#8387) Co-authored-by: Daniel Beck --- .../hudson/triggers/SlowTriggerAdminMonitor/message.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy b/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy index ca56053f434a..77bcedd36ebd 100644 --- a/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy +++ b/core/src/main/resources/hudson/triggers/SlowTriggerAdminMonitor/message.groovy @@ -35,7 +35,7 @@ dl { td(val.fullJobName) } else { td { - a(job.getFullDisplayName(), href: job.getUrl(), class: 'model-link') + a(job.getFullDisplayName(), href: rootURL + '/' + job.getUrl(), class: 'model-link') } } td(Util.getTimeSpanString(val.duration)) From a17f0f63c9fac78d3afc4f7864aa0399d6f1c7b4 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Fri, 18 Aug 2023 15:38:27 +0100 Subject: [PATCH 21/42] Remove unused CSS variables (#8354) --- war/src/main/js/add-item.scss | 2 - war/src/main/js/widgets/variables.scss | 16 ----- war/src/main/scss/abstracts/theme.scss | 69 ++++------------------ war/src/main/scss/base/style.scss | 16 ----- war/src/main/scss/modules/page-header.scss | 1 - 5 files changed, 12 insertions(+), 92 deletions(-) delete mode 100644 war/src/main/js/widgets/variables.scss diff --git a/war/src/main/js/add-item.scss b/war/src/main/js/add-item.scss index b9ef9eb9e930..e033c98a5de5 100644 --- a/war/src/main/js/add-item.scss +++ b/war/src/main/js/add-item.scss @@ -1,5 +1,3 @@ -@use "widgets/variables"; - /* * Widget styles */ diff --git a/war/src/main/js/widgets/variables.scss b/war/src/main/js/widgets/variables.scss deleted file mode 100644 index 4137129e1b39..000000000000 --- a/war/src/main/js/widgets/variables.scss +++ /dev/null @@ -1,16 +0,0 @@ -:root { - --medium-translucent: rgba(255, 255, 255, 0.75); - - --shade-hint: rgba(0, 0, 0, 0.025); - --shade: rgba(0, 0, 0, 0.1); - - --line-blue: #69c; - --line-green: #acb; - - --danger: #d24939; - --danger-line: #be3a2b; - --danger-dark: #a23225; - --danger-dark-line: #942e22; - - --input-line-height: 2.25em; -} diff --git a/war/src/main/scss/abstracts/theme.scss b/war/src/main/scss/abstracts/theme.scss index c2bb35014d07..abc5fd3cb928 100644 --- a/war/src/main/scss/abstracts/theme.scss +++ b/war/src/main/scss/abstracts/theme.scss @@ -51,12 +51,13 @@ $semantics: ( // branding --secondary: hsl(240, 10%, 50%); - --focus: #3fb3f7; + --focus-input-border: #063f61; + --focus-input-glow: #{color.change(#0b6aa2, $alpha: 0.25)}; + + // Deprecated --focus-btn-primary: #{color.change(#0b6aa2, $alpha: 0.5)}; --focus-btn-secondary: #{color.change(#0b6aa2, $alpha: 0.5)}; --focus-btn-danger: #{color.change(#cc0003, $alpha: 0.5)}; - --focus-input-border: #063f61; - --focus-input-glow: #{color.change(#0b6aa2, $alpha: 0.25)}; // State colors --primary-hover: #0587d4; @@ -71,36 +72,23 @@ $semantics: ( // Background colors --background: var(--white); - // Borders - --line-green: #acb; - --medium-translucent: rgba(255, 255, 255, 0.75); - - // Page header colors - --logo-bg: var(--white); + // Header --brand-link-color: var(--secondary); --header-link-color: var(--white); --header-link-color-active: #f5f5f5; - --header-link-outline: var(--focus); --header-search-border: var(--white); --search-input-color: var(--brand-link-color); --search-bg: var(--white); --search-box-completion-bg: var(--primary-hover); --search-box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.3); - - // Header classic colors --header-bg-classic: #000; --header-link-bg-classic-hover: #404040; --header-link-bg-classic-active: #404040; - - // Header dimensions --header-item-border-radius: 4px; // Breadcrumbs bar --breadcrumbs-bar-background: hsla(240, 20%, 96.5%, 0.8); - // Footer - --footer-background: hsla(240, 20%, 96.5%, 0.8); - // Alert call outs --alert-success-text-color: #155724; --alert-success-bg-color: #d4edda; @@ -118,19 +106,19 @@ $semantics: ( // Typography --text-color-secondary: var(--secondary); - // Button generic + // Deprecated - Button generic --btn-font-weight: bold; --btn-text-color: var(--white); --btn-font-size: var(--font-size-xs); --btn-line-height: 1rem; --btn-large-font-size: var(--font-size-sm); --btn-large-line-height: 1.25rem; - // Button primary + // Deprecated - Button primary --button-color--primary: var(--background); --btn-primary-bg: #063f61; --btn-primary-bg-hover: lighten(#063f61, 7.5%); --btn-primary-bg-active: lighten(#063f61, 12%); - // Button primary + // Deprecated - Button primary --btn-secondary-color: var(--secondary); --btn-secondary-bg: var(--btn-text-color); --btn-secondary-border: var(--medium-grey); @@ -143,7 +131,7 @@ $semantics: ( --btn-secondary-color--active: var(--primary-active); --btn-secondary-bg--active: var(--btn-secondary-bg); --btn-secondary-border--active: var(--primary-active); - // Button link + // Deprecated - Button link --btn-link-color: var(--accent-color); --btn-link-font-weight: var(--link-font-weight); --btn-link-color--hover: var(--primary-hover); @@ -151,10 +139,6 @@ $semantics: ( --btn-link-color--active: var(--primary-active); --btn-link-bg--active: var(--light-grey); - // Help area - --help-area-bg-color: var(--very-light-grey); - --configure-job-help-area-bg-color: var(--medium-translucent); - // Table --table-background: var(--panel-header-bg-color); --table-header-foreground: var(--text-color); @@ -250,25 +234,7 @@ $semantics: ( --tabs-item-foreground--selected: var(--link-color); --tabs-border-radius: calc((10px + 34px) / 2); - // Deprecated - --tab-link-border-radius: 10px; - --tab-link-border-width: 2px; - --tab-link-padding-x: 0.75rem; - --tab-link-padding-y: 0.375rem; - --tab-link-font-weight: bold; - --tab-link-text-color: var(--text-color-secondary); - --tab-link-bg: transparent; - --tab-link-border-color: var(--light-grey); - --tab-link-text-color--hover: var(--tab-link-text-color); // Redundant? - --tab-link-bg--hover: var(--light-grey); - --tab-link-border-color--hover: var(--tab-link-bg--hover); // Redundant? - --tab-link-text-color--active: var(--tab-link-text-color); // Redundant? - --tab-link-bg--active: var(--light-grey); - --tab-link-border-color--active: var(--tab-link-checked-bg); // Redundant? - --tab-link-checked-text-color: var(--white); - --tab-link-checked-bg: var(--dark-grey); - --tab-link-checked-border-color: var(--tab-link-checked-bg); - // Tabbar baseline + // Deprecated - Tabbar baseline --tab-baseline-width: 2px; --tab-baseline-color: var(--light-grey); --tab-baseline-default-display: none; @@ -310,21 +276,14 @@ $semantics: ( --standard-transition: 0.3s ease; --elastic-transition: 0.3s cubic-bezier(0, 0.68, 0.5, 1.5); - // Pop out menus + // Deprecated - Pop out menus --menu-text-color: black; --menu-bg-color: var(--white); --menu-selected-color: #b3d4ff; --menu-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); - // Manage component - --manage-option-bg-color--hover: var(--very-light-grey); - --manage-option-bg-color--active: var(--light-grey); - --manage-option-border-color: var(--medium-grey); - - // Add form widget / configure job + // Deprecated - Add form widget / configure job --light-bg-color: #eee; - --bright-bg-color: #f9f9f9; - --brightest-bg-color: var(--white); --light-bg-color--hover: rgba(255, 255, 255, 0.65); --add-item-btn-decorator-border-color: #acb; --add-item-btn-decorator-bg-color: rgba(245, 249, 239, 0.75); @@ -341,10 +300,6 @@ $semantics: ( // Auto complete --auto-complete-bg-color--prehighlight: #b3d4ff; - // Call to action - --call-to-action-link-color: #000; - --call-to-action-text-color: var(--alert-info-text-color); - // Default button --button-background: hsla(240, 25%, 75%, 0.1); --button-background--hover: hsla(240, 25%, 75%, 0.175); diff --git a/war/src/main/scss/base/style.scss b/war/src/main/scss/base/style.scss index 22acd9884ee4..ca452ac136a5 100644 --- a/war/src/main/scss/base/style.scss +++ b/war/src/main/scss/base/style.scss @@ -156,22 +156,6 @@ a.tip:hover span { text-align: left; } -.call-to-action { - display: table; - margin-bottom: 5px; - padding: 10px; - background-color: var(--alert-info-bg-color); - border-left: 4px solid #577baa; - color: var(--call-to-action-text-color); -} - -.call-to-action a, -.call-to-action a:visited { - color: var(--call-to-action-link-color); - font-weight: bold; - font-size: larger; -} - img { vertical-align: middle; border: 0; diff --git a/war/src/main/scss/modules/page-header.scss b/war/src/main/scss/modules/page-header.scss index 3b1211777e01..13e63d91a771 100644 --- a/war/src/main/scss/modules/page-header.scss +++ b/war/src/main/scss/modules/page-header.scss @@ -57,7 +57,6 @@ a.page-header__brand-link { padding: 0.5rem; margin-right: 0 !important; font-weight: bold; - outline-color: var(--header-link-outline); &:link, &:visited { From 6b25ba210c8d62cfd621e48d69a35651dd963603 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 19 Aug 2023 09:59:45 +0200 Subject: [PATCH 22/42] Update dependency prettier to v3.0.2 (#8396) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/war/package.json b/war/package.json index 363ea601b452..86bef7ee869b 100644 --- a/war/package.json +++ b/war/package.json @@ -38,7 +38,7 @@ "postcss-loader": "7.3.3", "postcss-preset-env": "9.1.1", "postcss-scss": "4.0.6", - "prettier": "3.0.1", + "prettier": "3.0.2", "sass": "1.65.1", "sass-loader": "13.3.2", "style-loader": "3.3.3", diff --git a/war/yarn.lock b/war/yarn.lock index 57535318721c..19677a13e7e0 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -4368,7 +4368,7 @@ __metadata: postcss-loader: 7.3.3 postcss-preset-env: 9.1.1 postcss-scss: 4.0.6 - prettier: 3.0.1 + prettier: 3.0.2 sass: 1.65.1 sass-loader: 13.3.2 sortablejs: 1.15.0 @@ -6091,12 +6091,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.0.1": - version: 3.0.1 - resolution: "prettier@npm:3.0.1" +"prettier@npm:3.0.2": + version: 3.0.2 + resolution: "prettier@npm:3.0.2" bin: prettier: bin/prettier.cjs - checksum: e1f3f16c7fe0495de3faa182597871f74927d787cce3c52095a66ff5d7eacc05173371d5f58bf12141a0a1b6bfe739a338531d6cf18b92c7256c1319f2c84e73 + checksum: 118b59ddb6c80abe2315ab6d0f4dd1b253be5cfdb20622fa5b65bb1573dcd362e6dd3dcf2711dd3ebfe64aecf7bdc75de8a69dc2422dcd35bdde7610586b677a languageName: node linkType: hard From a52c2634e95535413d8680929b07eff058bea759 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:00:05 +0200 Subject: [PATCH 23/42] Update dependency postcss to v8.4.28 (#8398) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/war/package.json b/war/package.json index 86bef7ee869b..b17678f16c79 100644 --- a/war/package.json +++ b/war/package.json @@ -34,7 +34,7 @@ "eslint-config-prettier": "9.0.0", "handlebars-loader": "1.7.3", "mini-css-extract-plugin": "2.7.6", - "postcss": "8.4.27", + "postcss": "8.4.28", "postcss-loader": "7.3.3", "postcss-preset-env": "9.1.1", "postcss-scss": "4.0.6", diff --git a/war/yarn.lock b/war/yarn.lock index 19677a13e7e0..59ebeeb428f1 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -4364,7 +4364,7 @@ __metadata: jquery: 3.7.0 lodash: 4.17.21 mini-css-extract-plugin: 2.7.6 - postcss: 8.4.27 + postcss: 8.4.28 postcss-loader: 7.3.3 postcss-preset-env: 9.1.1 postcss-scss: 4.0.6 @@ -6073,14 +6073,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.27, postcss@npm:^8.4.21, postcss@npm:^8.4.24, postcss@npm:^8.4.25": - version: 8.4.27 - resolution: "postcss@npm:8.4.27" +"postcss@npm:8.4.28, postcss@npm:^8.4.21, postcss@npm:^8.4.24, postcss@npm:^8.4.25": + version: 8.4.28 + resolution: "postcss@npm:8.4.28" dependencies: nanoid: ^3.3.6 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: 1cdd0c298849df6cd65f7e646a3ba36870a37b65f55fd59d1a165539c263e9b4872a402bf4ed1ca1bc31f58b68b2835545e33ea1a23b161a1f8aa6d5ded81e78 + checksum: f605c24a36f7e400bad379735fbfc893ccb8d293ad6d419bb824db77cdcb69f43d614ef35f9f7091f32ca588d130ec60dbcf53b366e6bf88a8a64bbeb3c05f6d languageName: node linkType: hard From 7560bb5a5c25c152a566eb2edeee96bcef443500 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 19 Aug 2023 18:08:10 +0100 Subject: [PATCH 24/42] Bump org.jenkins-ci.plugins:display-url-api from 2.3.8 to 2.3.9 (#8397) Co-authored-by: dependabot[bot] <49699333+dependabot[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 11a2057e69ab..e94559ee386d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -95,7 +95,7 @@ THE SOFTWARE. org.jenkins-ci.plugins display-url-api - 2.3.8 + 2.3.9 From 2c28368086bfc0a2b5a8a07d5160e4a15a217a87 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sat, 19 Aug 2023 18:08:21 +0100 Subject: [PATCH 25/42] Remove 'track-mouse' JS (#8391) --- core/src/main/resources/lib/layout/pane.jelly | 2 +- .../main/webapp/scripts/hudson-behavior.js | 22 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/core/src/main/resources/lib/layout/pane.jelly b/core/src/main/resources/lib/layout/pane.jelly index 7e10c3d59d71..e7c4a04a8245 100644 --- a/core/src/main/resources/lib/layout/pane.jelly +++ b/core/src/main/resources/lib/layout/pane.jelly @@ -52,7 +52,7 @@ THE SOFTWARE. -
    +
    diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index 4197fa903207..7f682b1bc33e 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1786,28 +1786,6 @@ function rowvgStartEachRow(recursive, f) { }, ); - Behaviour.specify(".track-mouse", "-track-mouse", ++p, function (element) { - var DOM = YAHOO.util.Dom; - - element.addEventListener("mouseenter", function () { - element.classList.add("mouseover"); - - var mousemoveTracker = function (event) { - var elementRegion = DOM.getRegion(element); - if ( - event.x < elementRegion.left || - event.x > elementRegion.right || - event.y < elementRegion.top || - event.y > elementRegion.bottom - ) { - element.classList.remove("mouseover"); - document.removeEventListener("mousemove", mousemoveTracker); - } - }; - document.addEventListener("mousemove", mousemoveTracker); - }); - }); - window.addEventListener("load", function () { // Add a class to the bottom bar when it's stuck to the bottom of the screen const el = document.querySelector("#bottom-sticker"); From 7ad6a020d319a982cedd65857f245246e34dc47e Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sat, 19 Aug 2023 18:08:35 +0100 Subject: [PATCH 26/42] Remove unused CSS classes (#8372) Co-authored-by: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- war/src/main/scss/base/style.scss | 245 +----------------------------- 1 file changed, 1 insertion(+), 244 deletions(-) diff --git a/war/src/main/scss/base/style.scss b/war/src/main/scss/base/style.scss index ca452ac136a5..e1957b7f01c1 100644 --- a/war/src/main/scss/base/style.scss +++ b/war/src/main/scss/base/style.scss @@ -22,19 +22,6 @@ * THE SOFTWARE. */ -/* Panel */ -@media (width >= 1600px) { - body#jenkins.j-hide-left #main-panel { - max-width: 75%; - } -} - -@media (width >= 2000px) { - body#jenkins.j-hide-left #main-panel { - max-width: 85%; - } -} - form { margin: 0; } @@ -97,23 +84,6 @@ td.no-wrap { border-radius: var(--form-input-border-radius); } -/* #header .login { - position: relative; - top: 6px; - color: white; - margin-right: 10px; -} - -#header .login a, #header .login a:visited { - color: white; - text-decoration: none; -} - -#header .login a:hover { - text-decoration: underline; - color: #ccc; -} */ - a.lowkey:link { text-decoration: none; color: inherit; @@ -170,17 +140,6 @@ table.tab { border-collapse: collapse; } -td.selected_tab { - vertical-align: middle; - border: 1px #090 solid; - background: #fff; -} - -td.tab_filler { - background: #fff; - border-bottom: 1px #090 solid; -} - td.tab { vertical-align: middle; border: 1px #090 solid; @@ -230,10 +189,6 @@ pre.console { white-space: nowrap; } -.setting-checkbox { - font-weight: 500; -} - .setting-help { margin-left: 0.5rem; margin-right: 0.5rem; @@ -288,84 +243,15 @@ pre.console { flex-shrink: 1; } -/* div that looks like a hyperlink */ -.pseudoLink { - cursor: pointer; -} - .advancedBody { display: none; } -.scm_info { - width: 480px; -} - -.build-keep { - font-weight: bold; -} - -.task-header { - display: block; - border-bottom: 1px #090 solid; - font-weight: bold; - font-size: var(--font-size-xs); -} - .jenkins-not-applicable { color: darkgrey; font-style: italic; } -.smallfont { - font-size: 9px; -} - -#foldertab { - padding: 4px 0; - margin-left: 0; - border-bottom: 1px solid #090; - font: - bold 12px Helvetica, - Arial, - sans-serif; -} - -#foldertab li { - list-style: none; - margin: 0; - display: inline; -} - -#foldertab li a { - padding: 4px 0.5em; - margin-left: 3px; - border: 1px solid #090; - border-bottom: none; - background: #090; - text-decoration: none; -} - -#foldertab li a:link { - color: white; -} - -#foldertab li a:visited { - color: white; -} - -#foldertab li a:hover { - color: white; - background: #6c0; - border-color: #6c0; -} - -#foldertab li a#current { - background: white; - border-bottom: 1px solid white; - color: black; -} - .changeset-message { padding: 0.8rem 1rem; border-radius: 10px; @@ -382,25 +268,6 @@ pre.console { color: gray; } -#login-field { - vertical-align: middle; - padding-right: 1em; - width: 1px; -} - -#login-field span { - white-space: nowrap; - color: white; -} - -#login-field a { - /* - link inside login field should be always white. - If I set this to inherit, it won't work in IE7 - */ - color: white; -} - .bottom-sticker, #bottom-sticker { position: sticky; @@ -535,76 +402,6 @@ img.icon-help { vertical-align: text-top; } -/* ====================== project view tab bar ===================================== */ -#viewList { - border: none; - margin-bottom: 0; - width: 100%; - white-space: nowrap; -} - -#viewList td { - padding: 0; -} - -#viewList td.inactive { - border: solid 1px #ccc; - border-bottom-color: #bbb; -} - -#viewList td.inactive:hover { - background-color: #777; -} - -#viewList td.inactive a { - text-decoration: none; - color: #444; -} - -#viewList td.inactive a:hover { - color: #f1f1f1; -} - -#viewList td.noleft { - border-left: none; -} - -#viewList td.noright { - border-right: none; -} - -#viewList td.active { - border: solid 1px #bbb; - padding: 0.5em; - border-bottom: none; - vertical-align: middle; - background-color: rgb(240, 240, 240); - font-weight: bold; - white-space: nowrap; -} - -#viewList td.filler { - border: none; - border-bottom: solid 1px #bbb; - width: 100%; - text-align: right; -} - -#viewList a { - display: block; - padding: 0.5em; - white-space: nowrap; -} - -#projectstatus .header { - border-bottom: 1px solid var(--bigtable-header-border-color); -} - -#projectstatus > thead > th { - text-align: left; - // padding: 7px 0px; -} - /* ============================ list view entries ======================== */ div.listview-jobs { max-height: 300px; @@ -613,24 +410,6 @@ div.listview-jobs { padding-left: 15px; } -/* ============================ parameters form ========================== */ - -table.parameters { - border-collapse: collapse; -} - -table.parameters > tbody > tr:first-child > td { - padding-top: 4px; -} - -table.parameters .setting-description { - padding-bottom: 4px; -} - -table.parameters > tbody:hover { - background-color: var(--table-parameters-bg--hover); -} - /* ============================ health report hover ========================== */ .healthReport a { @@ -1051,24 +830,6 @@ textarea { resize: vertical; } -/* - * TODO(andipabst): Not used after https://github.com/jenkinsci/jenkins/pull/4299, - * remove once there are no more dependencies - */ -#plugins .compatWarning { - white-space: normal; - margin-top: 0.5em; - padding-left: 2em; - color: #f00; -} - -#plugins .securityWarning { - white-space: normal; - margin-top: 0.5em; - padding-left: 2em; - color: #f00; -} - /* ========================= progress bar ========================= */ table.progress-bar { @@ -1143,6 +904,7 @@ table.progress-bar.red td.progress-bar-done { } /* ========================= tags/labels ================== */ +// Used in core/src/main/java/hudson/util/TagCloud.java#getClassName /* tag0 is the least important tag in a tag cloud */ .tag0 { @@ -1265,11 +1027,6 @@ select.select-ajax-pending { } /* ========================= Button styles ================= */ -.btn-box { - display: block; - margin-top: 2em; -} - #disable-project { margin-top: 6px; } From 7f3fa048ca0c8094a552d02d5863c49fc06ea42a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 19 Aug 2023 13:08:49 -0400 Subject: [PATCH 27/42] [JENKINS-61452] Tolerate corrupt Base64 in `PlainTextConsoleOutputStream` (#8378) --- .../console/PlainTextConsoleOutputStream.java | 12 ++++++++- .../console/AnnotatedLargeTextTest.java | 26 ++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/console/PlainTextConsoleOutputStream.java b/core/src/main/java/hudson/console/PlainTextConsoleOutputStream.java index f3b5bd8adf7e..70bc85b7b110 100644 --- a/core/src/main/java/hudson/console/PlainTextConsoleOutputStream.java +++ b/core/src/main/java/hudson/console/PlainTextConsoleOutputStream.java @@ -28,6 +28,10 @@ import java.io.DataInputStream; import java.io.IOException; import java.io.OutputStream; +import java.nio.charset.Charset; +import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.commons.lang.StringEscapeUtils; /** * Filters out console notes. @@ -36,6 +40,8 @@ */ public class PlainTextConsoleOutputStream extends LineTransformationOutputStream.Delegating { + private static final Logger LOGGER = Logger.getLogger(PlainTextConsoleOutputStream.class.getName()); + /** * */ @@ -64,7 +70,11 @@ protected void eol(byte[] in, int sz) throws IOException { int rest = sz - next; ByteArrayInputStream b = new ByteArrayInputStream(in, next, rest); - ConsoleNote.skip(new DataInputStream(b)); + try { + ConsoleNote.skip(new DataInputStream(b)); + } catch (IOException x) { + LOGGER.log(Level.FINE, "Failed to skip annotation from \"" + StringEscapeUtils.escapeJava(new String(in, next, rest, Charset.defaultCharset())) + "\"", x); + } int bytesUsed = rest - b.available(); // bytes consumed by annotations written += bytesUsed; diff --git a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java index dcd3b96c3210..825bd2b60460 100644 --- a/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java +++ b/test/src/test/java/hudson/console/AnnotatedLargeTextTest.java @@ -27,6 +27,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.matchesRegex; import static org.junit.Assert.assertEquals; import hudson.MarkupText; @@ -52,7 +53,7 @@ public class AnnotatedLargeTextTest { public static JenkinsRule r = new JenkinsRule(); @Rule - public LoggerRule logging = new LoggerRule().record(ConsoleAnnotationOutputStream.class, Level.FINE).capture(100); + public LoggerRule logging = new LoggerRule().record(ConsoleAnnotationOutputStream.class, Level.FINE).record(PlainTextConsoleOutputStream.class, Level.FINE).capture(100); @Test public void smokes() throws Exception { @@ -138,6 +139,29 @@ public void badMac() throws Exception { + "AAA\\u001B[0myour home.\\n\"")); // TODO assert that this is IOException: MAC mismatch } + @Issue("JENKINS-61452") + @Test + public void corruptedNote() throws Exception { + ByteBuffer buf = new ByteBuffer(); + PrintStream ps = new PrintStream(buf, true, StandardCharsets.UTF_8); + ps.print("Some text.\n"); + ps.print("Go back to " + TestNote.encodeTo("/root", "your home") + ".\n"); + ps.print("More text.\n"); + String original = buf.toString(); + String corrupted = original.replace("+", "\u0000"); + buf = new ByteBuffer(); + buf.write(corrupted.getBytes()); + AnnotatedLargeText text = new AnnotatedLargeText<>(buf, StandardCharsets.UTF_8, true, null); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + text.writeLogTo(0, baos); + assertThat(baos.toString(StandardCharsets.UTF_8), matchesRegex("Some text[.]\nGo back to .*your home[.]\nMore text[.]\n")); + assertThat(logging.getMessages(), hasItem(matchesRegex("Failed to skip annotation from .+"))); + StringWriter w = new StringWriter(); + text.writeHtmlTo(0, w); + assertThat(w.toString(), matchesRegex("Some text[.]\nGo back to .*your home[.]\nMore text[.]\n")); + assertThat(logging.getMessages(), hasItem(matchesRegex("Failed to resurrect annotation from .+"))); + } + /** Simplified version of {@link HyperlinkNote}. */ static class TestNote extends ConsoleNote { private final String url; From b9cb7d4789d1116e6e02bd0ae27ec8706e082bad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:26:26 +0200 Subject: [PATCH 28/42] Update Yarn to v3.6.2 (#8401) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Alexander Brandes --- war/package.json | 2 +- war/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/war/package.json b/war/package.json index b17678f16c79..f81857f5701e 100644 --- a/war/package.json +++ b/war/package.json @@ -62,5 +62,5 @@ "defaults", "not IE 11" ], - "packageManager": "yarn@3.6.1" + "packageManager": "yarn@3.6.2" } diff --git a/war/pom.xml b/war/pom.xml index 963a3b0d50fc..809ecf86c968 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -50,8 +50,8 @@ THE SOFTWARE. 1.22.19 - 3.6.1 - 811210abb5fb5751da12ead8a9cbc0c150b07e43ac9cbedec6752d22abfd2bd6 + 3.6.2 + 506981787ad29ec22e9c904a0d630c3b03b2e5c078b074990404aabbf2fb007b From 7fb3cfe114ab7daa332546a82335298dae91fc5b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 09:26:43 +0200 Subject: [PATCH 29/42] Update dependency postcss-scss to v4.0.7 (#8400) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/war/package.json b/war/package.json index f81857f5701e..0466a98c8b52 100644 --- a/war/package.json +++ b/war/package.json @@ -37,7 +37,7 @@ "postcss": "8.4.28", "postcss-loader": "7.3.3", "postcss-preset-env": "9.1.1", - "postcss-scss": "4.0.6", + "postcss-scss": "4.0.7", "prettier": "3.0.2", "sass": "1.65.1", "sass-loader": "13.3.2", diff --git a/war/yarn.lock b/war/yarn.lock index 59ebeeb428f1..69141cdd076d 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -4367,7 +4367,7 @@ __metadata: postcss: 8.4.28 postcss-loader: 7.3.3 postcss-preset-env: 9.1.1 - postcss-scss: 4.0.6 + postcss-scss: 4.0.7 prettier: 3.0.2 sass: 1.65.1 sass-loader: 13.3.2 @@ -6013,12 +6013,12 @@ __metadata: languageName: node linkType: hard -"postcss-scss@npm:4.0.6": - version: 4.0.6 - resolution: "postcss-scss@npm:4.0.6" +"postcss-scss@npm:4.0.7": + version: 4.0.7 + resolution: "postcss-scss@npm:4.0.7" peerDependencies: postcss: ^8.4.19 - checksum: 133a1cba31e2e167f4e841e66ec6a798eaf44c7911f9182ade0b5b1e71a8198814aa390b8c9d5db6b01358115232e5b15b1a4f8c5198acfccfb1f3fdbd328cdf + checksum: 579aa6807bf4934dd9bd3f8a257736c1121e189f2aa23853512e2a1be1005bac0136020d08e626998bcd3537080a1403f7a03a8cae277f3e0e314eb3c779db9c languageName: node linkType: hard From 70effdf2dd7935fda493cc9f88a857f1e6b592f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:49:56 -0700 Subject: [PATCH 30/42] Bump org.jenkins-ci.plugins:script-security from 1269.v639888f5e366 to 1271.vdede89739a_81 (#8408) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 e94559ee386d..5073b1052f2a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -101,7 +101,7 @@ THE SOFTWARE. org.jenkins-ci.plugins script-security - 1269.v639888f5e366 + 1271.vdede89739a_81 From 0d9a2603ec8fe8b820ab77b0d3e9fc648c31c9cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:50:13 -0700 Subject: [PATCH 31/42] Bump org.jenkins-ci.main:jenkins-test-harness from 2053.v0ea_6fc5d99b_f to 2058.va_7b_41a_286207 (#8409) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[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 5073b1052f2a..2440a09e1b19 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -116,7 +116,7 @@ THE SOFTWARE. ${project.groupId} jenkins-test-harness - 2053.v0ea_6fc5d99b_f + 2058.va_7b_41a_286207 test From 8abf635fe92eb1e2303d73d88a21c61f5aeb0bb4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:50:42 -0700 Subject: [PATCH 32/42] Update dependency sass to v1.66.0 (#8402) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/war/package.json b/war/package.json index 0466a98c8b52..d44a45f8cd2c 100644 --- a/war/package.json +++ b/war/package.json @@ -39,7 +39,7 @@ "postcss-preset-env": "9.1.1", "postcss-scss": "4.0.7", "prettier": "3.0.2", - "sass": "1.65.1", + "sass": "1.66.0", "sass-loader": "13.3.2", "style-loader": "3.3.3", "stylelint": "15.10.2", diff --git a/war/yarn.lock b/war/yarn.lock index 69141cdd076d..432c19b91922 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -4369,7 +4369,7 @@ __metadata: postcss-preset-env: 9.1.1 postcss-scss: 4.0.7 prettier: 3.0.2 - sass: 1.65.1 + sass: 1.66.0 sass-loader: 13.3.2 sortablejs: 1.15.0 style-loader: 3.3.3 @@ -6412,16 +6412,16 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.65.1": - version: 1.65.1 - resolution: "sass@npm:1.65.1" +"sass@npm:1.66.0": + version: 1.66.0 + resolution: "sass@npm:1.66.0" dependencies: chokidar: ">=3.0.0 <4.0.0" immutable: ^4.0.0 source-map-js: ">=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 33e325fc80cd07489992e0814cd4929496f87493ffe78c423c2dbafa5746a574e6f3bde20c2a3e4ea47b16ee3d6bc5afcf1d36b405227b829d6c4c9ddcc7f8e2 + checksum: ae292e6a41a8812c0206c528885969e2f6f35870397e6d5bc33477927fd09faffda196aefe2cfe49e0c57f1448129b522f845bb134f3b6a131b184e3be86cf92 languageName: node linkType: hard From a4589ec6d86b7b08794da7e4c9714ccdc0864eff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:51:21 -0700 Subject: [PATCH 33/42] Bump org.apache.ant:ant from 1.10.13 to 1.10.14 (#8405) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index 537d08f11a36..f2373994789c 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -189,7 +189,7 @@ THE SOFTWARE. org.apache.ant ant - 1.10.13 + 1.10.14 org.apache.commons From 7a783c3e175543db8b94128b760ff95b484fbaac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:52:11 -0700 Subject: [PATCH 34/42] Bump org.springframework.security:spring-security-bom from 5.8.5 to 5.8.6 (#8407) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/pom.xml b/bom/pom.xml index f2373994789c..7f0162f63cf5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -64,7 +64,7 @@ THE SOFTWARE. org.springframework.security spring-security-bom - 5.8.5 + 5.8.6 pom import From e9886db619e511a5acf8a873d51b13591dcf9c47 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 21 Aug 2023 22:23:41 +0100 Subject: [PATCH 35/42] Move app bar for plugins (#8376) * Move app bar for plugins, make sidebar sticky * Update _updateSite.js * Remove sticky side panel --- core/src/main/resources/hudson/PluginManager/available.jelly | 2 -- core/src/main/resources/hudson/PluginManager/installed.jelly | 2 -- core/src/main/resources/hudson/PluginManager/sidepanel.jelly | 1 + core/src/main/resources/hudson/PluginManager/updates.jelly | 2 -- war/src/main/scss/form/search-bar.scss | 1 + 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/hudson/PluginManager/available.jelly b/core/src/main/resources/hudson/PluginManager/available.jelly index 212deb493567..b0fa8f8fe5a3 100644 --- a/core/src/main/resources/hudson/PluginManager/available.jelly +++ b/core/src/main/resources/hudson/PluginManager/available.jelly @@ -32,8 +32,6 @@ THE SOFTWARE. - -
    - - diff --git a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly index 6c45382c9e03..21755b32072d 100644 --- a/core/src/main/resources/hudson/PluginManager/sidepanel.jelly +++ b/core/src/main/resources/hudson/PluginManager/sidepanel.jelly @@ -28,6 +28,7 @@ THE SOFTWARE. + diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly index 6bf1982d89fe..25402731273b 100644 --- a/core/src/main/resources/hudson/PluginManager/updates.jelly +++ b/core/src/main/resources/hudson/PluginManager/updates.jelly @@ -35,8 +35,6 @@ THE SOFTWARE. - -
    Date: Mon, 21 Aug 2023 23:25:19 +0200 Subject: [PATCH 36/42] [JENKINS-71848] Remove admin monitors popup from `/manage/` again (#8388) [JENKINS-71848] Remove admin monitors popup from /manage/ again Co-authored-by: Daniel Beck --- .../management/AdministrativeMonitorsDecorator.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java index eb9685f54ba0..cc1d5214e0ae 100644 --- a/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java +++ b/core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java @@ -28,6 +28,7 @@ import hudson.Extension; import hudson.diagnosis.ReverseProxySetupMonitor; import hudson.model.AdministrativeMonitor; +import hudson.model.ManageJenkinsAction; import hudson.model.PageDecorator; import hudson.util.HudsonIsLoading; import hudson.util.HudsonIsRestarting; @@ -53,9 +54,6 @@ public class AdministrativeMonitorsDecorator extends PageDecorator { private final Collection ignoredJenkinsRestOfUrls = new ArrayList<>(); public AdministrativeMonitorsDecorator() { - // redundant - ignoredJenkinsRestOfUrls.add("manage"); - // otherwise this would be added to every internal context menu building request ignoredJenkinsRestOfUrls.add("contextMenu"); @@ -165,6 +163,11 @@ public Collection getMonitorsToDisplay() { return null; } + // Don't show on Manage Jenkins + if (o instanceof ManageJenkinsAction) { + return null; + } + // don't show for some URLs served directly by Jenkins if (o instanceof Jenkins) { String url = a.getRestOfUrl(); From c1a6c6c9ddf432e8eae3db68d3ee13c1f762d785 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Mon, 21 Aug 2023 23:27:55 +0200 Subject: [PATCH 37/42] Replace hetero-list YUI button and menu with new style button and tippy.js menu (#8340) * refresh hetero-list UI use new button style replace the YUI menu with a tippy menu * fix lint errors * avoid blanks * prettier * keep button in div * fix test * fix test #2 * convert inputs to buttons for plugins * prettier * remove unnecessary style definition * remove adjunct * adjust filter --------- Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com> --- .../filter-menu-button/filter-menu-button.js | 70 ----- .../main/resources/lib/form/hetero-list.jelly | 5 +- .../lib/form/hetero-list/hetero-list.js | 201 ------------- .../test/java/lib/form/HeteroListTest.java | 8 +- .../js/components/dropdowns/hetero-list.js | 276 ++++++++++++++++++ war/src/main/js/components/dropdowns/index.js | 2 + .../main/js/components/dropdowns/templates.js | 9 +- war/src/main/js/components/dropdowns/utils.js | 9 +- war/src/main/js/util/keyboard.js | 50 +++- war/src/main/js/util/symbols.js | 2 + war/src/main/scss/modules/buttons.scss | 3 +- war/src/main/scss/modules/dropdowns.scss | 46 ++- 12 files changed, 389 insertions(+), 292 deletions(-) delete mode 100644 core/src/main/resources/lib/form/filter-menu-button/filter-menu-button.js delete mode 100644 core/src/main/resources/lib/form/hetero-list/hetero-list.js create mode 100644 war/src/main/js/components/dropdowns/hetero-list.js diff --git a/core/src/main/resources/lib/form/filter-menu-button/filter-menu-button.js b/core/src/main/resources/lib/form/filter-menu-button/filter-menu-button.js deleted file mode 100644 index e81ccc43fe7a..000000000000 --- a/core/src/main/resources/lib/form/filter-menu-button/filter-menu-button.js +++ /dev/null @@ -1,70 +0,0 @@ -// prettier-ignore -window.createFilterMenuButton = function ( - button, - menu, - menuAlignment, - menuMinScrollHeight -) { - var MIN_NUM_OPTIONS = 5; - var menuButton = new YAHOO.widget.Button(button, { - type: "menu", - menu: menu, - menualignment: menuAlignment, - menuminscrollheight: menuMinScrollHeight, - }); - - var filter = _createFilterMenuButton(menuButton._menu); - - menuButton._menu.element.appendChild(filter); - menuButton._menu.showEvent.subscribe(function () { - _applyFilterKeyword(menuButton._menu, filter.firstElementChild); - filter.style.display = - _getItemList(menuButton._menu).children.length >= MIN_NUM_OPTIONS - ? "" - : "NONE"; - }); - menuButton._menu.setInitialFocus = function () { - setTimeout(function () { - filter.firstElementChild.focus(); - }, 0); - }; - - return menuButton; -}; - -function _createFilterMenuButton(menu) { - const filterInput = document.createElement("input"); - filterInput.classList.add("jenkins-input"); - filterInput.setAttribute("placeholder", "Filter"); - filterInput.setAttribute("spellcheck", "false"); - filterInput.setAttribute("type", "search"); - - filterInput.addEventListener("input", (event) => - _applyFilterKeyword(menu, event.currentTarget), - ); - filterInput.addEventListener("keypress", (event) => { - if (event.key === "Enter") { - event.preventDefault(); - } - }); - - const filterContainer = document.createElement("div"); - filterContainer.appendChild(filterInput); - - return filterContainer; -} - -function _applyFilterKeyword(menu, filterInput) { - const filterKeyword = (filterInput.value || "").toLowerCase(); - const itemList = _getItemList(menu); - let item, match; - for (item of itemList.children) { - match = item.innerText.toLowerCase().includes(filterKeyword); - item.style.display = match ? "" : "NONE"; - } - menu.align(); -} - -function _getItemList(menu) { - return menu.body.children[0]; -} diff --git a/core/src/main/resources/lib/form/hetero-list.jelly b/core/src/main/resources/lib/form/hetero-list.jelly index 66fe2dd91773..b817c936c4e8 100644 --- a/core/src/main/resources/lib/form/hetero-list.jelly +++ b/core/src/main/resources/lib/form/hetero-list.jelly @@ -107,8 +107,6 @@ THE SOFTWARE. - -
    @@ -156,7 +154,8 @@ THE SOFTWARE.
    - +
    diff --git a/core/src/main/resources/lib/form/hetero-list/hetero-list.js b/core/src/main/resources/lib/form/hetero-list/hetero-list.js deleted file mode 100644 index a51423bf6e0b..000000000000 --- a/core/src/main/resources/lib/form/hetero-list/hetero-list.js +++ /dev/null @@ -1,201 +0,0 @@ -// @include lib.form.filter-menu-button.filter-menu-button - -// do the ones that extract innerHTML so that they can get their original HTML before -// other behavior rules change them (like YUI buttons.) -Behaviour.specify( - "DIV.hetero-list-container", - "hetero-list", - -100, - function (e) { - if (isInsideRemovable(e)) { - return; - } - - // components for the add button - var menu = document.createElement("SELECT"); - // In case nested content also uses hetero-list - var btn = Array.from(e.querySelectorAll("INPUT.hetero-list-add")).pop(); - if (!btn) { - return; - } - YAHOO.util.Dom.insertAfter(menu, btn); - - var prototypes = e.lastElementChild; - while (!prototypes.classList.contains("prototypes")) { - prototypes = prototypes.previousElementSibling; - } - var insertionPoint = prototypes.previousElementSibling; // this is where the new item is inserted. - - // extract templates - var templates = []; - var children = prototypes.children; - for (var i = 0; i < children.length; i++) { - var n = children[i]; - var name = n.getAttribute("name"); - var tooltip = n.getAttribute("tooltip"); - var descriptorId = n.getAttribute("descriptorId"); - // YUI Menu interprets this