From e6a5d3e404c1c03ab85390de15a50d1509b3ebef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 18:16:19 +0100 Subject: [PATCH 01/55] Update Yarn to v4.2.2 (#9262) 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 d7bf475bb21e..de59cc9e2814 100644 --- a/war/package.json +++ b/war/package.json @@ -65,5 +65,5 @@ "defaults", "not IE 11" ], - "packageManager": "yarn@4.2.1" + "packageManager": "yarn@4.2.2" } diff --git a/war/pom.xml b/war/pom.xml index 3f5ee316b0ee..bb6a4d965f53 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -51,8 +51,8 @@ THE SOFTWARE. 1.22.19 - 4.2.1 - 15ce76682a8cd2090257b883cd69c637925b29573f9573e8403ec227d5ab6815 + 4.2.2 + 1aa43a5304405be7a7cb9cb5de7b97de9c4e8ddd3273e4dad00d6ae3eb39f0ef From 6130d2f398836feed755b14cc67d7d24c707907a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 12 May 2024 18:16:30 +0100 Subject: [PATCH 02/55] Update dependency globals to v15.2.0 (#9264) 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 de59cc9e2814..9f07be28aeb1 100644 --- a/war/package.json +++ b/war/package.json @@ -34,7 +34,7 @@ "eslint": "9.2.0", "eslint-config-prettier": "9.1.0", "eslint-formatter-checkstyle": "8.40.0", - "globals": "15.1.0", + "globals": "15.2.0", "handlebars-loader": "1.7.3", "mini-css-extract-plugin": "2.9.0", "postcss": "8.4.38", diff --git a/war/yarn.lock b/war/yarn.lock index 97cfb92d1118..3cab3eaa9fa6 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -3957,10 +3957,10 @@ __metadata: languageName: node linkType: hard -"globals@npm:15.1.0": - version: 15.1.0 - resolution: "globals@npm:15.1.0" - checksum: 10c0/ae9cd15057dc6a21d6dbafe9f47b66bd063c6d3c9215fa1e8294bd130d89f188c48370a11a9525a5a33bd8689fc4fdfd3f474d930692d7abb7459cd982503336 +"globals@npm:15.2.0": + version: 15.2.0 + resolution: "globals@npm:15.2.0" + checksum: 10c0/ba8c34ef10fc1e65319bfde912a76dbe7654085af8b09d897974cfbe000c6d950ddcf28b4a0de372fe4144836aede32210a97b27ef184f68e1ff8bcd1a74fc5e languageName: node linkType: hard @@ -4380,7 +4380,7 @@ __metadata: eslint: "npm:9.2.0" eslint-config-prettier: "npm:9.1.0" eslint-formatter-checkstyle: "npm:8.40.0" - globals: "npm:15.1.0" + globals: "npm:15.2.0" handlebars: "npm:4.7.8" handlebars-loader: "npm:1.7.3" hotkeys-js: "npm:3.12.2" From b235abaf1435d574c200efd9a5b409190cfd7e1a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 08:18:40 +0100 Subject: [PATCH 03/55] Update dependency node to v20.13.1 (#9267) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/pom.xml b/war/pom.xml index bb6a4d965f53..be061b083bf1 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -47,7 +47,7 @@ THE SOFTWARE. 8080 2.12.1-101.v85b_e08b_780dd - 20.13.0 + 20.13.1 1.22.19 From 6371bc1b5aa8caa742dbdb45a5ce65b7b83c522b Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 13 May 2024 11:46:55 -0700 Subject: [PATCH 04/55] Remove unnecessary references in allowed classes list (#9265) --- .../src/main/resources/jenkins/security/whitelisted-classes.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/resources/jenkins/security/whitelisted-classes.txt b/core/src/main/resources/jenkins/security/whitelisted-classes.txt index c2f974a7ef9f..b1805a6bd387 100644 --- a/core/src/main/resources/jenkins/security/whitelisted-classes.txt +++ b/core/src/main/resources/jenkins/security/whitelisted-classes.txt @@ -133,8 +133,6 @@ java.util.logging.Level java.util.logging.LogRecord java.util.regex.Pattern -org.apache.commons.fileupload.disk.DiskFileItem -org.apache.commons.fileupload.util.FileItemHeadersImpl org.apache.tools.ant.Location # TODO remove when https://github.com/jenkinsci/xtrigger-lib/pull/9 is widely adopted in fstrigger-plugin, urltrigger-plugin, etc. From a751e556c199a9a50188cfb64f4ccf8eb97b12aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 13:50:27 -0700 Subject: [PATCH 05/55] Bump io.jenkins.plugins:design-library from 296.v56576267b_508 to 303.v6b_23c12334c9 (#9269) 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 7ea028b43b7d..6ab4427927ca 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -329,7 +329,7 @@ THE SOFTWARE. io.jenkins.plugins design-library - 296.v56576267b_508 + 303.v6b_23c12334c9 hpi ${project.build.outputDirectory}/plugins design-library.jpi From 46237384bd58757a985e0949d5a8c7a998b9e256 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 13 May 2024 18:08:37 -0700 Subject: [PATCH 06/55] Revert "Remove 'Disable project' button from project view" (#9272) This reverts commit 57d64642be1f6810f964e77f11b7382885d05d0e. --- .../lib/hudson/project/makeDisabled.jelly | 9 +++++++++ test/src/test/java/hudson/model/ProjectTest.java | 14 ++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly index e53f9ab12ad9..9eb7f4f6571c 100644 --- a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly +++ b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly @@ -41,5 +41,14 @@ THE SOFTWARE. + +
+
+ + + +
+
+ diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java index e3f2d84493e3..82d9266e0e62 100644 --- a/test/src/test/java/hudson/model/ProjectTest.java +++ b/test/src/test/java/hudson/model/ProjectTest.java @@ -644,13 +644,15 @@ public void testDoDisable() throws Exception { JenkinsRule.WebClient wc = j.createWebClient(); wc.withBasicCredentials(user.getId(), "password"); + HtmlPage p = wc.goTo(project.getUrl()); - HtmlPage p = wc.getPage(project, "configure"); - HtmlForm form = p.getFormByName("config"); - form.getInputByName("enable").click(); - j.submit(form); - - assertTrue("Project should be disabled.", project.isDisabled()); + List forms = p.getForms(); + for (HtmlForm form : forms) { + if ("disable".equals(form.getAttribute("action"))) { + j.submit(form); + } + } + assertTrue("Project should be disabled.", project.isDisabled()); } @Test From 968f8705ee274b4ea8672d456e75f09e091ee6e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 19:53:46 -0700 Subject: [PATCH 07/55] Bump io.jenkins.plugins:ionicons-api from 73.vb_f522f227457 to 74.v93d5eb_813d5f (#9270) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- war/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/pom.xml b/test/pom.xml index 6ab4427927ca..3523fe70d00e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -78,7 +78,7 @@ THE SOFTWARE. io.jenkins.plugins ionicons-api - 73.vb_f522f227457 + 74.v93d5eb_813d5f io.jenkins.plugins diff --git a/war/pom.xml b/war/pom.xml index be061b083bf1..fd636c87e4f9 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -463,7 +463,7 @@ THE SOFTWARE. io.jenkins.plugins ionicons-api - 73.vb_f522f227457 + 74.v93d5eb_813d5f hpi From 98103bdccf47bbb927c502d0646a06725a002904 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 21:45:48 -0700 Subject: [PATCH 08/55] Update dependency sass to v1.77.1 (#9273) 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 9f07be28aeb1..cd548f1d1814 100644 --- a/war/package.json +++ b/war/package.json @@ -42,7 +42,7 @@ "postcss-preset-env": "9.5.11", "postcss-scss": "4.0.9", "prettier": "3.2.5", - "sass": "1.77.0", + "sass": "1.77.1", "sass-loader": "14.2.1", "style-loader": "4.0.0", "stylelint": "16.5.0", diff --git a/war/yarn.lock b/war/yarn.lock index 3cab3eaa9fa6..40af33bad843 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -4392,7 +4392,7 @@ __metadata: postcss-preset-env: "npm:9.5.11" postcss-scss: "npm:4.0.9" prettier: "npm:3.2.5" - sass: "npm:1.77.0" + sass: "npm:1.77.1" sass-loader: "npm:14.2.1" sortablejs: "npm:1.15.2" style-loader: "npm:4.0.0" @@ -6349,16 +6349,16 @@ __metadata: languageName: node linkType: hard -"sass@npm:1.77.0": - version: 1.77.0 - resolution: "sass@npm:1.77.0" +"sass@npm:1.77.1": + version: 1.77.1 + resolution: "sass@npm:1.77.1" dependencies: chokidar: "npm:>=3.0.0 <4.0.0" immutable: "npm:^4.0.0" source-map-js: "npm:>=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 10c0/bce0e5f5b535491e4e775045a79f19cbe10d800ef53b5f7698958d2992505d7b124c968169b05a0190842d8e0a24c2aa6d75dfbdd7c213820d9d59e227009c19 + checksum: 10c0/edcfc7d038234b1198c3ddcac5963fcd1e17a9c1ee0f9bd09784ab5353b60ff50b189b4c9154b34f5da9ca0eaab8b189fd3e83a4b43a494151ad4735f8e5f364 languageName: node linkType: hard From f0d4f26bc87ad99954b7f1f7e54570a0f16e41e6 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 14 May 2024 13:15:24 +0000 Subject: [PATCH 09/55] [maven-release-plugin] prepare release jenkins-2.458 --- 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 91fac96bf44b..d0b1bf6dacf6 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.458 jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 14d6323ca762..ff3347d3dbce 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.458 cli diff --git a/core/pom.xml b/core/pom.xml index faef477b9cd2..16a2264d85c4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.458 jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index fe1e89a120dc..a01a7316c1e0 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.458 jenkins-coverage diff --git a/pom.xml b/pom.xml index 46793065ac9e..5ac7db0b3e89 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.458 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.458 https://github.com/jenkinsci/jenkins @@ -75,7 +75,7 @@ THE SOFTWARE. 2.458 -SNAPSHOT - 2024-05-07T14:35:14Z + 2024-05-14T10:34:13Z github diff --git a/test/pom.xml b/test/pom.xml index 3523fe70d00e..21dfd7fc04ac 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.458 jenkins-test diff --git a/war/pom.xml b/war/pom.xml index fd636c87e4f9..f5f313a56582 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.458 jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index c91e1583c039..2821964882ea 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.458 ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index a99aada6a446..4219bd4624d4 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.458 ../.. From 6fd81b8a9ab429eded73a2fe0d239c40c0419d61 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 14 May 2024 13:15:47 +0000 Subject: [PATCH 10/55] [maven-release-plugin] prepare for next development iteration --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 8 ++++---- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty10/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index d0b1bf6dacf6..91fac96bf44b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index ff3347d3dbce..14d6323ca762 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index 16a2264d85c4..faef477b9cd2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index a01a7316c1e0..fe1e89a120dc 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} jenkins-coverage diff --git a/pom.xml b/pom.xml index 5ac7db0b3e89..6293399fbd82 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.458 + ${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.458 + ${scmTag} https://github.com/jenkinsci/jenkins @@ -73,9 +73,9 @@ THE SOFTWARE. - 2.458 + 2.459 -SNAPSHOT - 2024-05-14T10:34:13Z + 2024-05-14T13:15:25Z github diff --git a/test/pom.xml b/test/pom.xml index 21dfd7fc04ac..3523fe70d00e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} jenkins-test diff --git a/war/pom.xml b/war/pom.xml index f5f313a56582..fd636c87e4f9 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} jenkins-war diff --git a/websocket/jetty10/pom.xml b/websocket/jetty10/pom.xml index 2821964882ea..c91e1583c039 100644 --- a/websocket/jetty10/pom.xml +++ b/websocket/jetty10/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 4219bd4624d4..a99aada6a446 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.458 + ${revision}${changelist} ../.. From bcb5ed8f2218208b11b029d023a70bc7c0851418 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 10:11:54 -0600 Subject: [PATCH 11/55] Update dependency postcss-preset-env to v9.5.12 (#9274) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 66 ++++++++++++++++++++++++------------------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/war/package.json b/war/package.json index cd548f1d1814..8194b247611a 100644 --- a/war/package.json +++ b/war/package.json @@ -39,7 +39,7 @@ "mini-css-extract-plugin": "2.9.0", "postcss": "8.4.38", "postcss-loader": "8.1.1", - "postcss-preset-env": "9.5.11", + "postcss-preset-env": "9.5.12", "postcss-scss": "4.0.9", "prettier": "3.2.5", "sass": "1.77.1", diff --git a/war/yarn.lock b/war/yarn.lock index 40af33bad843..2e5390e52164 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -1432,15 +1432,15 @@ __metadata: languageName: node linkType: hard -"@csstools/postcss-cascade-layers@npm:^4.0.4": - version: 4.0.4 - resolution: "@csstools/postcss-cascade-layers@npm:4.0.4" +"@csstools/postcss-cascade-layers@npm:^4.0.5": + version: 4.0.6 + resolution: "@csstools/postcss-cascade-layers@npm:4.0.6" dependencies: - "@csstools/selector-specificity": "npm:^3.0.3" + "@csstools/selector-specificity": "npm:^3.1.1" postcss-selector-parser: "npm:^6.0.13" peerDependencies: postcss: ^8.4 - checksum: 10c0/87fdd1e3d846e45c2e415f24f66076e04c3c4539e8b802f1114b2a0fef9421d562d9eb61464ba3599d73805555ad8e95c51a8827cb3ddacfda01ec0df4afbfe0 + checksum: 10c0/134019e9b3f71de39034658e2a284f549883745a309f774d8d272871f9e65680e0981c893766537a8a56ed7f41dba2d0f9fc3cb4fa4057c227bc193976a2ec79 languageName: node linkType: hard @@ -1564,15 +1564,15 @@ __metadata: languageName: node linkType: hard -"@csstools/postcss-is-pseudo-class@npm:^4.0.6": - version: 4.0.6 - resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.6" +"@csstools/postcss-is-pseudo-class@npm:^4.0.7": + version: 4.0.8 + resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8" dependencies: - "@csstools/selector-specificity": "npm:^3.0.3" + "@csstools/selector-specificity": "npm:^3.1.1" postcss-selector-parser: "npm:^6.0.13" peerDependencies: postcss: ^8.4 - checksum: 10c0/aa071954e08dc9368fbeddbec6a8da2dea3a771b33bad53f67f3bc5a6b2f0a270909948f3e7b29ec885f4cceee245f16388809aeb0620284a1d66ad1f2026f28 + checksum: 10c0/82f191571c3e0973354a54ef15feeb17f9408b4abbefad19fc0f087683b1212fc854cdf09a47324267dd47be4c5cb47d63b8d083695a67c3f8f3e53df3d561f6 languageName: node linkType: hard @@ -1798,12 +1798,12 @@ __metadata: languageName: node linkType: hard -"@csstools/selector-specificity@npm:^3.0.3": - version: 3.0.3 - resolution: "@csstools/selector-specificity@npm:3.0.3" +"@csstools/selector-specificity@npm:^3.0.3, @csstools/selector-specificity@npm:^3.1.1": + version: 3.1.1 + resolution: "@csstools/selector-specificity@npm:3.1.1" peerDependencies: postcss-selector-parser: ^6.0.13 - checksum: 10c0/e4f0355165882ddde8bd4a2f0252868150e67b9fae927fd2d94a91cee31e438e7041059f20b9c755a93b0bd8e527a9f78b01168fe67b3539be32091240aa63bf + checksum: 10c0/1d4a3f8015904d6aeb3203afe0e1f6db09b191d9c1557520e3e960c9204ad852df9db4cbde848643f78a26f6ea09101b4e528dbb9193052db28258dbcc8a6e1d languageName: node linkType: hard @@ -3079,16 +3079,16 @@ __metadata: languageName: node linkType: hard -"css-has-pseudo@npm:^6.0.3": - version: 6.0.3 - resolution: "css-has-pseudo@npm:6.0.3" +"css-has-pseudo@npm:^6.0.4": + version: 6.0.5 + resolution: "css-has-pseudo@npm:6.0.5" dependencies: - "@csstools/selector-specificity": "npm:^3.0.3" + "@csstools/selector-specificity": "npm:^3.1.1" postcss-selector-parser: "npm:^6.0.13" postcss-value-parser: "npm:^4.2.0" peerDependencies: postcss: ^8.4 - checksum: 10c0/bbe663eff5256233c7bcce256cd8de7d93d82f2d4f2ca104af8e39e2159170d67746d3a2954385d03ec4ea7ef2728fe9a7d8cb62c52c0a6df1ad3d3bb1e3439d + checksum: 10c0/946930b7e699d6dbcb8426ebcd593228ee0e2143a148fb2399111ea4c9ed8d6eb3447e944251f1be44ae987d5ab16e450b0b006ca197f318c2a3760ba431fbb9 languageName: node linkType: hard @@ -4389,7 +4389,7 @@ __metadata: mini-css-extract-plugin: "npm:2.9.0" postcss: "npm:8.4.38" postcss-loader: "npm:8.1.1" - postcss-preset-env: "npm:9.5.11" + postcss-preset-env: "npm:9.5.12" postcss-scss: "npm:4.0.9" prettier: "npm:3.2.5" sass: "npm:1.77.1" @@ -5714,16 +5714,16 @@ __metadata: languageName: node linkType: hard -"postcss-nesting@npm:^12.1.2": - version: 12.1.2 - resolution: "postcss-nesting@npm:12.1.2" +"postcss-nesting@npm:^12.1.3": + version: 12.1.4 + resolution: "postcss-nesting@npm:12.1.4" dependencies: "@csstools/selector-resolve-nested": "npm:^1.1.0" - "@csstools/selector-specificity": "npm:^3.0.3" + "@csstools/selector-specificity": "npm:^3.1.1" postcss-selector-parser: "npm:^6.0.13" peerDependencies: postcss: ^8.4 - checksum: 10c0/39d1d100f61863f904393b17169be83cdf82bd50d530efb3e3ae0c7b0f838b254e10e5d12e25119cf31dce9e351a2b770a03f9b2029ff33bef0ec924c0d2f642 + checksum: 10c0/b3408de4c04b58a88a56fa81aeff59b12615c78d4f5a57e09c1ee47e74cff51f8c9cad1684da0059067303cf65b4b688f85f0c5ca8d54af8c4ab998f727ab9fd languageName: node linkType: hard @@ -5877,11 +5877,11 @@ __metadata: languageName: node linkType: hard -"postcss-preset-env@npm:9.5.11": - version: 9.5.11 - resolution: "postcss-preset-env@npm:9.5.11" +"postcss-preset-env@npm:9.5.12": + version: 9.5.12 + resolution: "postcss-preset-env@npm:9.5.12" dependencies: - "@csstools/postcss-cascade-layers": "npm:^4.0.4" + "@csstools/postcss-cascade-layers": "npm:^4.0.5" "@csstools/postcss-color-function": "npm:^3.0.16" "@csstools/postcss-color-mix-function": "npm:^2.0.16" "@csstools/postcss-exponential-functions": "npm:^1.0.7" @@ -5891,7 +5891,7 @@ __metadata: "@csstools/postcss-hwb-function": "npm:^3.0.15" "@csstools/postcss-ic-unit": "npm:^3.0.6" "@csstools/postcss-initial": "npm:^1.0.1" - "@csstools/postcss-is-pseudo-class": "npm:^4.0.6" + "@csstools/postcss-is-pseudo-class": "npm:^4.0.7" "@csstools/postcss-light-dark-function": "npm:^1.0.5" "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1" "@csstools/postcss-logical-overflow": "npm:^1.0.1" @@ -5913,7 +5913,7 @@ __metadata: autoprefixer: "npm:^10.4.19" browserslist: "npm:^4.22.3" css-blank-pseudo: "npm:^6.0.2" - css-has-pseudo: "npm:^6.0.3" + css-has-pseudo: "npm:^6.0.4" css-prefers-color-scheme: "npm:^9.0.1" cssdb: "npm:^8.0.0" postcss-attribute-case-insensitive: "npm:^6.0.3" @@ -5933,7 +5933,7 @@ __metadata: postcss-image-set-function: "npm:^6.0.3" postcss-lab-function: "npm:^6.0.16" postcss-logical: "npm:^7.0.1" - postcss-nesting: "npm:^12.1.2" + postcss-nesting: "npm:^12.1.3" postcss-opacity-percentage: "npm:^2.0.0" postcss-overflow-shorthand: "npm:^5.0.1" postcss-page-break: "npm:^3.0.4" @@ -5943,7 +5943,7 @@ __metadata: postcss-selector-not: "npm:^7.0.2" peerDependencies: postcss: ^8.4 - checksum: 10c0/9460f4ce18cf1af7582d0a1f366151f59b6e9b0c7cbb62e59081dc91da14760a749f59fa52bc190e5e2c8fd531952c647719d19c4740aa1a0ebcb93f075ad931 + checksum: 10c0/3e0276b2061baa396547f9c0090fcb0c6149d3735c7aefa99a8e520701aae0b7265578b59d5e4efa9f5e61659c161e39590a5d63bac49469b99da1c549b63231 languageName: node linkType: hard From 9f8da7addbd937f3e6fe429a41862e8263efcb93 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 10:03:50 -0700 Subject: [PATCH 12/55] Update jenkins/ath Docker tag to v5829 (#9278) 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 e39c053ef66e..8bde184008c4 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=5814.vdc5d6d484b_40 +export ATH_VERSION=5829.v1ea_976c1636e if [[ $# -eq 0 ]]; then export JDK=17 From 6aadc6298524c86b85db6d072921be140744fdf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 10:04:43 -0700 Subject: [PATCH 13/55] Bump commons-logging:commons-logging from 1.3.1 to 1.3.2 (#9279) 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 91fac96bf44b..d137e44beb6e 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -340,7 +340,7 @@ THE SOFTWARE. commons-logging commons-logging - 1.3.1 + 1.3.2 provided From 1dea9a19ca16dda3d3ea5285e1be3fabcae851d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 19:51:49 -0600 Subject: [PATCH 14/55] Bump org.springframework:spring-framework-bom from 5.3.34 to 5.3.35 (#9280) Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 5.3.34 to 5.3.35. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v5.3.34...v5.3.35) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-type: direct:production update-type: version-update:semver-patch ... 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 d137e44beb6e..4d4ae6622938 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -55,7 +55,7 @@ THE SOFTWARE. org.springframework spring-framework-bom - 5.3.34 + 5.3.35 pom import From 24572788ce8b728582aabcaaedffa929ebd4fdcd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 08:03:06 +0100 Subject: [PATCH 15/55] Update dependency postcss-preset-env to v9.5.13 (#9282) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- war/package.json | 2 +- war/yarn.lock | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/war/package.json b/war/package.json index 8194b247611a..5e37993906c1 100644 --- a/war/package.json +++ b/war/package.json @@ -39,7 +39,7 @@ "mini-css-extract-plugin": "2.9.0", "postcss": "8.4.38", "postcss-loader": "8.1.1", - "postcss-preset-env": "9.5.12", + "postcss-preset-env": "9.5.13", "postcss-scss": "4.0.9", "prettier": "3.2.5", "sass": "1.77.1", diff --git a/war/yarn.lock b/war/yarn.lock index 2e5390e52164..a0fe9d620215 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -1432,7 +1432,7 @@ __metadata: languageName: node linkType: hard -"@csstools/postcss-cascade-layers@npm:^4.0.5": +"@csstools/postcss-cascade-layers@npm:^4.0.6": version: 4.0.6 resolution: "@csstools/postcss-cascade-layers@npm:4.0.6" dependencies: @@ -1564,7 +1564,7 @@ __metadata: languageName: node linkType: hard -"@csstools/postcss-is-pseudo-class@npm:^4.0.7": +"@csstools/postcss-is-pseudo-class@npm:^4.0.8": version: 4.0.8 resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8" dependencies: @@ -3079,7 +3079,7 @@ __metadata: languageName: node linkType: hard -"css-has-pseudo@npm:^6.0.4": +"css-has-pseudo@npm:^6.0.5": version: 6.0.5 resolution: "css-has-pseudo@npm:6.0.5" dependencies: @@ -4389,7 +4389,7 @@ __metadata: mini-css-extract-plugin: "npm:2.9.0" postcss: "npm:8.4.38" postcss-loader: "npm:8.1.1" - postcss-preset-env: "npm:9.5.12" + postcss-preset-env: "npm:9.5.13" postcss-scss: "npm:4.0.9" prettier: "npm:3.2.5" sass: "npm:1.77.1" @@ -5714,7 +5714,7 @@ __metadata: languageName: node linkType: hard -"postcss-nesting@npm:^12.1.3": +"postcss-nesting@npm:^12.1.4": version: 12.1.4 resolution: "postcss-nesting@npm:12.1.4" dependencies: @@ -5877,11 +5877,11 @@ __metadata: languageName: node linkType: hard -"postcss-preset-env@npm:9.5.12": - version: 9.5.12 - resolution: "postcss-preset-env@npm:9.5.12" +"postcss-preset-env@npm:9.5.13": + version: 9.5.13 + resolution: "postcss-preset-env@npm:9.5.13" dependencies: - "@csstools/postcss-cascade-layers": "npm:^4.0.5" + "@csstools/postcss-cascade-layers": "npm:^4.0.6" "@csstools/postcss-color-function": "npm:^3.0.16" "@csstools/postcss-color-mix-function": "npm:^2.0.16" "@csstools/postcss-exponential-functions": "npm:^1.0.7" @@ -5891,7 +5891,7 @@ __metadata: "@csstools/postcss-hwb-function": "npm:^3.0.15" "@csstools/postcss-ic-unit": "npm:^3.0.6" "@csstools/postcss-initial": "npm:^1.0.1" - "@csstools/postcss-is-pseudo-class": "npm:^4.0.7" + "@csstools/postcss-is-pseudo-class": "npm:^4.0.8" "@csstools/postcss-light-dark-function": "npm:^1.0.5" "@csstools/postcss-logical-float-and-clear": "npm:^2.0.1" "@csstools/postcss-logical-overflow": "npm:^1.0.1" @@ -5913,7 +5913,7 @@ __metadata: autoprefixer: "npm:^10.4.19" browserslist: "npm:^4.22.3" css-blank-pseudo: "npm:^6.0.2" - css-has-pseudo: "npm:^6.0.4" + css-has-pseudo: "npm:^6.0.5" css-prefers-color-scheme: "npm:^9.0.1" cssdb: "npm:^8.0.0" postcss-attribute-case-insensitive: "npm:^6.0.3" @@ -5933,7 +5933,7 @@ __metadata: postcss-image-set-function: "npm:^6.0.3" postcss-lab-function: "npm:^6.0.16" postcss-logical: "npm:^7.0.1" - postcss-nesting: "npm:^12.1.3" + postcss-nesting: "npm:^12.1.4" postcss-opacity-percentage: "npm:^2.0.0" postcss-overflow-shorthand: "npm:^5.0.1" postcss-page-break: "npm:^3.0.4" @@ -5943,7 +5943,7 @@ __metadata: postcss-selector-not: "npm:^7.0.2" peerDependencies: postcss: ^8.4 - checksum: 10c0/3e0276b2061baa396547f9c0090fcb0c6149d3735c7aefa99a8e520701aae0b7265578b59d5e4efa9f5e61659c161e39590a5d63bac49469b99da1c549b63231 + checksum: 10c0/5bbb6e87b1b3acc816ef445836f85df5f50ac96bdc3d571952a83794c80863c652d27ab14c66f6b88f86f5664119d49b357e4184162022cc3436676f3fbe833b languageName: node linkType: hard From dabf61f3e27dabe53d3183e97dea349bc2d182a5 Mon Sep 17 00:00:00 2001 From: Kevin Guerroudj <91883215+Kevin-CB@users.noreply.github.com> Date: Fri, 17 May 2024 15:56:10 +0200 Subject: [PATCH 16/55] Clarify artifacts permission description (#9276) clarify artifacts permission --- core/src/main/resources/hudson/model/Messages.properties | 2 +- core/src/main/resources/hudson/model/Messages_fr.properties | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index 96950428fee4..2b1a6559fa58 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -241,7 +241,7 @@ Run.UpdatePermission.Description=\ Run.ArtifactsPermission.Description=\ This permission grants the ability to retrieve the artifacts produced by \ builds. If you don’t want an user to access the artifacts, you can do so by \ - revoking this permission. + revoking this permission. This does not restrict the listing of artifacts. Run.InProgressDuration={0} and counting Run.NotStartedYet=Not started yet Run.ArtifactsBrowserTitle=Artifacts of {0} {1} diff --git a/core/src/main/resources/hudson/model/Messages_fr.properties b/core/src/main/resources/hudson/model/Messages_fr.properties index 1d64aee184f3..e6794e6fc49e 100644 --- a/core/src/main/resources/hudson/model/Messages_fr.properties +++ b/core/src/main/resources/hudson/model/Messages_fr.properties @@ -231,7 +231,8 @@ Run.UpdatePermission.Description=\ par exemple pour laisser des notes sur la cause d''échec d''un build. Run.ArtifactsPermission.Description=\ Ce droit permet de récupérer les artefacts produits par les builds. \ - Si un utilisateur ne doit pas accéder aux artefacts, vous pouvez l''en empêcher en désactivant ce droit. + Si un utilisateur ne doit pas accéder aux artefacts, vous pouvez l''en empêcher en désactivant ce droit. \ + Ce droit ne limite pas la possibilité de lister les artefacts. Run.InProgressDuration={0} et décompte Run.NotStartedYet=Pas encore commencé Run.ArtifactsBrowserTitle=Artefacts de {0} {1} From 5089ad5e5962d22294d48d57e5cccc68b26c5236 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Fri, 17 May 2024 17:16:27 +0200 Subject: [PATCH 17/55] [JENKINS-73158] avoid jumping layout due to tooltips (#9263) * [JENKINS-73158] avoid jumping layout due to tooltips The fix for JENKINS-72744 made the tooltip get appended to the parent element. But this can also cause troubles in some cases. To avoid this one can now decide whether the tooltip should be appended to the body (the default) or to the parent. Adjust all locations where a tooltip is displayed inside a widget to append it to the parent. This works well with those tooltips and avoids a jumping layout in the custom-folder-icon and potentially other places. * explicitly append to parent * fix attribute --- .../jenkins/widgets/HistoryPageFilter/queue-items.jelly | 4 ++-- core/src/main/resources/lib/hudson/progressBar.jelly | 1 + core/src/main/resources/lib/hudson/queue.jelly | 4 +++- core/src/main/resources/lib/layout/stopButton.jelly | 4 ++-- war/src/main/js/components/tooltips/index.js | 7 ++++++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly index 74c5535be819..4f51055a7a98 100644 --- a/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly +++ b/core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly @@ -57,8 +57,8 @@ THE SOFTWARE. -
- +
+
diff --git a/core/src/main/resources/lib/hudson/progressBar.jelly b/core/src/main/resources/lib/hudson/progressBar.jelly index b4e230263bcc..5a78ca5876e9 100644 --- a/core/src/main/resources/lib/hudson/progressBar.jelly +++ b/core/src/main/resources/lib/hudson/progressBar.jelly @@ -55,6 +55,7 @@ THE SOFTWARE. app-progress-bar ${attrs.large?'app-progress-bar--large':null} ${attrs.red?'app-progress-bar--error':null} ${attrs.href} ${attrs.tooltip} + true ${attrs.id} ${attrs.tooltipTemplate} diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly index f36c84a59d65..8a78c2b70b2f 100644 --- a/core/src/main/resources/lib/hudson/queue.jelly +++ b/core/src/main/resources/lib/hudson/queue.jelly @@ -74,7 +74,9 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/lib/layout/stopButton.jelly b/core/src/main/resources/lib/layout/stopButton.jelly index 336184090622..a44675e302dd 100644 --- a/core/src/main/resources/lib/layout/stopButton.jelly +++ b/core/src/main/resources/lib/layout/stopButton.jelly @@ -39,12 +39,12 @@ THE SOFTWARE. - + - + diff --git a/war/src/main/js/components/tooltips/index.js b/war/src/main/js/components/tooltips/index.js index 3521163917cd..443c4179ed14 100644 --- a/war/src/main/js/components/tooltips/index.js +++ b/war/src/main/js/components/tooltips/index.js @@ -5,7 +5,6 @@ const TOOLTIP_BASE = { arrow: false, theme: "tooltip", animation: "tooltip", - appendTo: "parent", }; /** @@ -21,6 +20,10 @@ function registerTooltip(element) { const tooltip = element.getAttribute("tooltip"); const htmlTooltip = element.getAttribute("data-html-tooltip"); + let appendTo = document.body; + if (element.hasAttribute("data-tooltip-append-to-parent")) { + appendTo = "parent"; + } if ( tooltip !== null && tooltip.trim().length > 0 && @@ -40,6 +43,7 @@ function registerTooltip(element) { onHidden(instance) { instance.reference.setAttribute("title", instance.props.content); }, + appendTo: appendTo, }, TOOLTIP_BASE, ), @@ -58,6 +62,7 @@ function registerTooltip(element) { instance.reference.getAttribute("data-tooltip-interactive") === "true"; }, + appendTo: appendTo, }, TOOLTIP_BASE, ), From 90a6ac5c38f33b6674ba78bdfee0a5fe2b757166 Mon Sep 17 00:00:00 2001 From: Markus Winter Date: Sat, 18 May 2024 16:40:17 +0200 Subject: [PATCH 18/55] [JENKINS-73114] avoid conflicts with css classes from bootstrap (#9254) * [JENKINS-73114] avoid conflict of css classes with bootstrap jenkins and bootstrap both have definitions for alert and alert-warning, alert-info, alert-danger. Bootstrap css definitions are included when e.g. the warning-ng plugin is installed and a job is configured to scan for warnings. The css classes from bootstrap are then chosen instead of the ones for Jenkins for things like the admin monitors. To make things umambiguous, add additional classes prefixed with `jenkins-` and make use of them in code. Keep the old definitions for backward compatibility with plugins. Followup changes are needed in plugins (Mostly those that define admin monitors) and the design-library * fix test --- .../message.jelly | 2 +- .../PluginDeprecationMonitor/message.jelly | 2 +- .../PluginUpdateMonitor/message.jelly | 2 +- .../hudson/PluginManager/advanced.jelly | 2 +- .../hudson/PluginManager/installed.jelly | 10 +-- .../hudson/PluginManager/updates.jelly | 16 ++--- .../message.jelly | 2 +- .../HudsonHomeDiskUsageMonitor/message.jelly | 2 +- .../NullIdDescriptorMonitor/message.jelly | 2 +- .../diagnosis/OldDataMonitor/message.jelly | 2 +- .../ReverseProxySetupMonitor/message.jelly | 2 +- .../TooManyJobsButNoView/message.jelly | 2 +- .../logging/LogRecorder/configure.jelly | 2 +- .../logging/LogRecorderManager/all.jelly | 2 +- .../CoreUpdateMonitor/message.jelly | 2 +- .../MonitorMarkedNodeOffline/message.jelly | 2 +- .../AdministrativeMonitorImpl/message.jelly | 2 +- .../SlowTriggerAdminMonitor/message.groovy | 2 +- .../util/AdministrativeError/message.jelly | 2 +- .../util/DoubleLaunchChecker/message.jelly | 2 +- .../diagnosis/HsErrPidList/message.jelly | 2 +- .../message.jelly | 2 +- .../ControllerExecutorsAgents/message.jelly | 2 +- .../ControllerExecutorsNoAgents/message.jelly | 2 +- .../RootUrlNotSetMonitor/message.jelly | 2 +- .../SecurityIsOffMonitor/message.jelly | 2 +- .../authenticate-security-token.jelly | 2 +- .../install/pluginSetupWizard.properties | 6 +- .../install/pluginSetupWizard_fr.properties | 4 +- .../install/pluginSetupWizard_it.properties | 6 +- .../install/pluginSetupWizard_lt.properties | 2 +- .../install/pluginSetupWizard_pl.properties | 4 +- .../pluginSetupWizard_pt_BR.properties | 6 +- .../install/pluginSetupWizard_sr.properties | 4 +- .../pluginSetupWizard_sv_SE.properties | 6 +- .../pluginSetupWizard_zh_CN.properties | 6 +- .../pluginSetupWizard_zh_TW.properties | 6 +- .../resources.css | 17 +++-- .../model/BuiltInNodeMigration/message.jelly | 2 +- .../message.jelly | 2 +- .../jenkins/model/Jenkins/downgrade.jelly | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../RekeySecretAdminMonitor/message.groovy | 8 +-- .../message.groovy | 2 +- .../UpdateSiteWarningsMonitor/message.groovy | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../message.jelly | 2 +- .../CSRFAdministrativeMonitor/message.jelly | 2 +- .../test/java/hudson/PluginManagerTest.java | 2 +- .../js/templates/plugin-manager/available.hbs | 8 +-- war/src/main/scss/components/_alert.scss | 71 ++++++++++--------- war/src/main/scss/pages/_manage-jenkins.scss | 39 +++++----- war/src/main/scss/simple-page.scss | 3 +- 55 files changed, 149 insertions(+), 147 deletions(-) diff --git a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly index 5ccac430ecd2..cb20ebf8dfe7 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginCycleDependenciesMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%PluginCycles}
diff --git a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly index 45c4cead0a44..1f5ec400bd3c 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginDeprecationMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%DeprecatedPlugins}
diff --git a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly index 73182ec483e4..b1f9ba193d49 100644 --- a/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly +++ b/core/src/main/resources/hudson/PluginManager/PluginUpdateMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE. -
+
${%RequiredPluginUpdates}
diff --git a/core/src/main/resources/hudson/PluginManager/advanced.jelly b/core/src/main/resources/hudson/PluginManager/advanced.jelly index 8d0e6abcd22e..81948afa6e80 100644 --- a/core/src/main/resources/hudson/PluginManager/advanced.jelly +++ b/core/src/main/resources/hudson/PluginManager/advanced.jelly @@ -37,7 +37,7 @@ THE SOFTWARE. -
+
${%proxyMovedBlurb(rootURL+"/manage/configure")}
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly index c22c9ddeeba1..3c3ee43e0193 100644 --- a/core/src/main/resources/hudson/PluginManager/installed.jelly +++ b/core/src/main/resources/hudson/PluginManager/installed.jelly @@ -54,7 +54,7 @@ THE SOFTWARE. data-is-restart-required="${app.updateCenter.isRestartRequiredForCompletion()}" /> -
${%Warning}: ${%requires.restart}
+
${%Warning}: ${%requires.restart}