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. 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/pom.xml b/pom.xml index 46793065ac9e..6293399fbd82 100644 --- a/pom.xml +++ b/pom.xml @@ -73,9 +73,9 @@ THE SOFTWARE. - 2.458 + 2.459 -SNAPSHOT - 2024-05-07T14:35:14Z + 2024-05-14T13:15:25Z github diff --git a/test/pom.xml b/test/pom.xml index 7ea028b43b7d..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 @@ -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 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 diff --git a/war/package.json b/war/package.json index d7bf475bb21e..8194b247611a 100644 --- a/war/package.json +++ b/war/package.json @@ -34,15 +34,15 @@ "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", "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.0", + "sass": "1.77.1", "sass-loader": "14.2.1", "style-loader": "4.0.0", "stylelint": "16.5.0", @@ -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..fd636c87e4f9 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -47,12 +47,12 @@ THE SOFTWARE. 8080 2.12.1-101.v85b_e08b_780dd - 20.13.0 + 20.13.1 1.22.19 - 4.2.1 - 15ce76682a8cd2090257b883cd69c637925b29573f9573e8403ec227d5ab6815 + 4.2.2 + 1aa43a5304405be7a7cb9cb5de7b97de9c4e8ddd3273e4dad00d6ae3eb39f0ef @@ -463,7 +463,7 @@ THE SOFTWARE. io.jenkins.plugins ionicons-api - 73.vb_f522f227457 + 74.v93d5eb_813d5f hpi diff --git a/war/yarn.lock b/war/yarn.lock index 97cfb92d1118..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 @@ -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" @@ -4389,10 +4389,10 @@ __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.0" + sass: "npm:1.77.1" sass-loader: "npm:14.2.1" sortablejs: "npm:1.15.2" style-loader: "npm:4.0.0" @@ -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 @@ -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