From f011fda465aa10bb4c02a5f508f820757baedbc0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 11:10:46 -0800 Subject: [PATCH 01/12] Update dependency prettier to v3.4.1 (#10012) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8a49fdd736b9..f3e18406341a 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "postcss-loader": "8.1.1", "postcss-preset-env": "10.1.1", "postcss-scss": "4.0.9", - "prettier": "3.3.3", + "prettier": "3.4.1", "sass": "1.81.0", "sass-loader": "16.0.3", "style-loader": "4.0.0", diff --git a/yarn.lock b/yarn.lock index e406b095def5..be3f5e40fcf0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4410,7 +4410,7 @@ __metadata: postcss-loader: "npm:8.1.1" postcss-preset-env: "npm:10.1.1" postcss-scss: "npm:4.0.9" - prettier: "npm:3.3.3" + prettier: "npm:3.4.1" sass: "npm:1.81.0" sass-loader: "npm:16.0.3" sortablejs: "npm:1.15.4" @@ -6132,12 +6132,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.3.3": - version: 3.3.3 - resolution: "prettier@npm:3.3.3" +"prettier@npm:3.4.1": + version: 3.4.1 + resolution: "prettier@npm:3.4.1" bin: prettier: bin/prettier.cjs - checksum: 10c0/b85828b08e7505716324e4245549b9205c0cacb25342a030ba8885aba2039a115dbcf75a0b7ca3b37bc9d101ee61fab8113fc69ca3359f2a226f1ecc07ad2e26 + checksum: 10c0/2d6cc3101ad9de72b49c59339480b0983e6ff6742143da0c43f476bf3b5ef88ede42ebd9956d7a0a8fa59f7a5990e8ef03c9ad4c37f7e4c9e5db43ee0853156c languageName: node linkType: hard From 33e96091749465b62f37a04535878ee80cbbab3c Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 29 Nov 2024 11:40:01 -0800 Subject: [PATCH 02/12] Run `npm run lint:fix` (#10013) --- src/main/scss/abstracts/_theme.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss index 0558369c9ac3..9353cc165201 100644 --- a/src/main/scss/abstracts/_theme.scss +++ b/src/main/scss/abstracts/_theme.scss @@ -31,9 +31,9 @@ $semantics: ( :root, .app-theme-picker__picker[data-theme="none"] { // Font related properties - --font-family-sans: system-ui, "Segoe UI", roboto, "Noto Sans", oxygen, ubuntu, - cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", arial, sans-serif, - "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + --font-family-sans: system-ui, "Segoe UI", roboto, "Noto Sans", oxygen, + ubuntu, cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", arial, + sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; --font-family-mono: ui-monospace, sfmono-regular, sf mono, jetbrainsmono, consolas, monospace; --font-size-base: 1rem; // 16px From 58d0c126448dc6d4df4cf6163a255e77210072c4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Nov 2024 20:34:56 -0800 Subject: [PATCH 03/12] Update dependency org.jenkins-ci.main:jenkins-test-harness to v2363 (#10014) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/pom.xml b/test/pom.xml index 46683b61abdd..50111b234ab0 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -178,7 +178,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-test-harness - 2361.v8f64d70711fb_ + 2363.vf95c19b_2ca_72 test From 670e8050a4171a00075e9a180c0ee52528c6113c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 07:40:32 +0000 Subject: [PATCH 04/12] Update dependency sortablejs to v1.15.5 (#10016) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f3e18406341a..eb29005acc16 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "hotkeys-js": "3.12.2", "jquery": "3.7.1", "lodash": "4.17.21", - "sortablejs": "1.15.4", + "sortablejs": "1.15.5", "tippy.js": "6.3.7", "window-handle": "1.0.1" }, diff --git a/yarn.lock b/yarn.lock index be3f5e40fcf0..c2f95d428049 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4413,7 +4413,7 @@ __metadata: prettier: "npm:3.4.1" sass: "npm:1.81.0" sass-loader: "npm:16.0.3" - sortablejs: "npm:1.15.4" + sortablejs: "npm:1.15.5" style-loader: "npm:4.0.0" stylelint: "npm:16.10.0" stylelint-checkstyle-reporter: "npm:1.0.0" @@ -6561,10 +6561,10 @@ __metadata: languageName: node linkType: hard -"sortablejs@npm:1.15.4": - version: 1.15.4 - resolution: "sortablejs@npm:1.15.4" - checksum: 10c0/aa22614b8aadc0253eb19b88c29d748af37bb3ab3d16a58c619a3bc806a96b5742e51908bffe94ab4d75a6f7458ea1524a4619c109a1e0716bb72b2ae25463e5 +"sortablejs@npm:1.15.5": + version: 1.15.5 + resolution: "sortablejs@npm:1.15.5" + checksum: 10c0/ddf467d2479fdd0c4731576d170194c995f062062721c7f16572b72d01f03e5df3daa429d3277b9c20cd43ce313d3c679a80bcee312c6583f25b6e8cb79bbf0f languageName: node linkType: hard From 5e2cf4ff3ef07dbc61d58577ffa2ad4368615d11 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:00:36 +0000 Subject: [PATCH 05/12] Update dependency sortablejs to v1.15.6 (#10017) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index eb29005acc16..977f015a3351 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "hotkeys-js": "3.12.2", "jquery": "3.7.1", "lodash": "4.17.21", - "sortablejs": "1.15.5", + "sortablejs": "1.15.6", "tippy.js": "6.3.7", "window-handle": "1.0.1" }, diff --git a/yarn.lock b/yarn.lock index c2f95d428049..ccca64ed2607 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4413,7 +4413,7 @@ __metadata: prettier: "npm:3.4.1" sass: "npm:1.81.0" sass-loader: "npm:16.0.3" - sortablejs: "npm:1.15.5" + sortablejs: "npm:1.15.6" style-loader: "npm:4.0.0" stylelint: "npm:16.10.0" stylelint-checkstyle-reporter: "npm:1.0.0" @@ -6561,10 +6561,10 @@ __metadata: languageName: node linkType: hard -"sortablejs@npm:1.15.5": - version: 1.15.5 - resolution: "sortablejs@npm:1.15.5" - checksum: 10c0/ddf467d2479fdd0c4731576d170194c995f062062721c7f16572b72d01f03e5df3daa429d3277b9c20cd43ce313d3c679a80bcee312c6583f25b6e8cb79bbf0f +"sortablejs@npm:1.15.6": + version: 1.15.6 + resolution: "sortablejs@npm:1.15.6" + checksum: 10c0/a75dcf53e5613b4106d46434e40114830f9c6449b3b439bc1925c1fbf0a0c1f044727a8f3d4ae1759fa7beaa33e7eb0c4a413e6aa88d6026577b59f3658ff727 languageName: node linkType: hard From e2999799a9f983b302c63d7aaf7856f4da62e7d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:00:45 +0000 Subject: [PATCH 06/12] Update dependency stylelint to v16.11.0 (#10018) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 79 ++++++++++++++++++++-------------------------------- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index 977f015a3351..02976322bb18 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "sass": "1.81.0", "sass-loader": "16.0.3", "style-loader": "4.0.0", - "stylelint": "16.10.0", + "stylelint": "16.11.0", "stylelint-checkstyle-reporter": "1.0.0", "stylelint-config-standard": "36.0.1", "webpack": "5.96.1", diff --git a/yarn.lock b/yarn.lock index ccca64ed2607..14a7d43ce2ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1189,7 +1189,7 @@ __metadata: languageName: node linkType: hard -"@csstools/css-parser-algorithms@npm:^3.0.1, @csstools/css-parser-algorithms@npm:^3.0.4": +"@csstools/css-parser-algorithms@npm:^3.0.4": version: 3.0.4 resolution: "@csstools/css-parser-algorithms@npm:3.0.4" peerDependencies: @@ -1198,23 +1198,13 @@ __metadata: languageName: node linkType: hard -"@csstools/css-tokenizer@npm:^3.0.1, @csstools/css-tokenizer@npm:^3.0.3": +"@csstools/css-tokenizer@npm:^3.0.3": version: 3.0.3 resolution: "@csstools/css-tokenizer@npm:3.0.3" checksum: 10c0/c31bf410e1244b942e71798e37c54639d040cb59e0121b21712b40015fced2b0fb1ffe588434c5f8923c9cd0017cfc1c1c8f3921abc94c96edf471aac2eba5e5 languageName: node linkType: hard -"@csstools/media-query-list-parser@npm:^3.0.1": - version: 3.0.1 - resolution: "@csstools/media-query-list-parser@npm:3.0.1" - peerDependencies: - "@csstools/css-parser-algorithms": ^3.0.1 - "@csstools/css-tokenizer": ^3.0.1 - checksum: 10c0/fca1935cabf9fb94128da87f72c34aa2cfce8eb0beba4c78d685c7b42aaba3521067710afc6905b7347fc41fe53947536ce15a7ef3387b48763d8f7d71778d5e - languageName: node - linkType: hard - "@csstools/media-query-list-parser@npm:^4.0.2": version: 4.0.2 resolution: "@csstools/media-query-list-parser@npm:4.0.2" @@ -1631,15 +1621,6 @@ __metadata: languageName: node linkType: hard -"@csstools/selector-specificity@npm:^4.0.0": - version: 4.0.0 - resolution: "@csstools/selector-specificity@npm:4.0.0" - peerDependencies: - postcss-selector-parser: ^6.1.0 - checksum: 10c0/6f4d4ecfdcd37f950100de8ffe0b4c1b1cc8c004aab2c2ebaa5c3e2bca2412d15b17d4628435f47a62d2c56db41bcbf985cb9c69e74b89964d48e421e93e75ba - languageName: node - linkType: hard - "@csstools/selector-specificity@npm:^5.0.0": version: 5.0.0 resolution: "@csstools/selector-specificity@npm:5.0.0" @@ -3157,13 +3138,13 @@ __metadata: languageName: node linkType: hard -"css-tree@npm:^3.0.0": - version: 3.0.0 - resolution: "css-tree@npm:3.0.0" +"css-tree@npm:^3.0.1": + version: 3.0.1 + resolution: "css-tree@npm:3.0.1" dependencies: - mdn-data: "npm:2.10.0" + mdn-data: "npm:2.12.1" source-map-js: "npm:^1.0.1" - checksum: 10c0/43d44fdf7004ae91d73d486f17894fef77efa33747a6752b9241cf0f5fb47fabc16ec34a96a993651d9014dfdeee803d7c5fcd3548214252ee19f4e5c98999b2 + checksum: 10c0/9f117f3067e68e9edb0b3db0134f420db1a62bede3e84d8835767ecfaa6f8ced5e87989cf39b65ffe65d788c134c8ea9abd7393d7c35838a9da84326adf57a9b languageName: node linkType: hard @@ -4415,7 +4396,7 @@ __metadata: sass-loader: "npm:16.0.3" sortablejs: "npm:1.15.6" style-loader: "npm:4.0.0" - stylelint: "npm:16.10.0" + stylelint: "npm:16.11.0" stylelint-checkstyle-reporter: "npm:1.0.0" stylelint-config-standard: "npm:36.0.1" tippy.js: "npm:6.3.7" @@ -4596,10 +4577,10 @@ __metadata: languageName: node linkType: hard -"known-css-properties@npm:^0.34.0": - version: 0.34.0 - resolution: "known-css-properties@npm:0.34.0" - checksum: 10c0/8549969f02b1858554e89faf4548ece37625d0d21b42e8d54fa53184e68e1512ef2531bb15941575ad816361ab7447b598c1b18c1b96ce0a868333d1a68f2e2c +"known-css-properties@npm:^0.35.0": + version: 0.35.0 + resolution: "known-css-properties@npm:0.35.0" + checksum: 10c0/04a4a2859d62670bb25b5b28091a1f03f6f0d3298a5ed3e7476397c5287b98c434f6dd9c004a0c67a53b7f21acc93f83c972e98c122f568d4d0bd21fd2b90fb6 languageName: node linkType: hard @@ -4781,10 +4762,10 @@ __metadata: languageName: node linkType: hard -"mdn-data@npm:2.10.0": - version: 2.10.0 - resolution: "mdn-data@npm:2.10.0" - checksum: 10c0/f6f1a6a6eb092bab250d06f6f6c7cb1733a77a17e7119aac829ad67d4322bbf6a30df3c6d88686e71942e66bd49274b2ddfede22a1d3df0d6c49a56fbd09eb7c +"mdn-data@npm:2.12.1": + version: 2.12.1 + resolution: "mdn-data@npm:2.12.1" + checksum: 10c0/1a09f441bdd423f2b0ab712665a1a3329fe7b15e9a2dad8c1c10c521ddb204ed186e7ac91052fd53a5ae0a07ac6eae53b5bcbb59ba8a1fb654268611297eea4a languageName: node linkType: hard @@ -6114,7 +6095,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.49, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.47": +"postcss@npm:8.4.49, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.49": version: 8.4.49 resolution: "postcss@npm:8.4.49" dependencies: @@ -6715,20 +6696,20 @@ __metadata: languageName: node linkType: hard -"stylelint@npm:16.10.0": - version: 16.10.0 - resolution: "stylelint@npm:16.10.0" +"stylelint@npm:16.11.0": + version: 16.11.0 + resolution: "stylelint@npm:16.11.0" dependencies: - "@csstools/css-parser-algorithms": "npm:^3.0.1" - "@csstools/css-tokenizer": "npm:^3.0.1" - "@csstools/media-query-list-parser": "npm:^3.0.1" - "@csstools/selector-specificity": "npm:^4.0.0" + "@csstools/css-parser-algorithms": "npm:^3.0.4" + "@csstools/css-tokenizer": "npm:^3.0.3" + "@csstools/media-query-list-parser": "npm:^4.0.2" + "@csstools/selector-specificity": "npm:^5.0.0" "@dual-bundle/import-meta-resolve": "npm:^4.1.0" balanced-match: "npm:^2.0.0" colord: "npm:^2.9.3" cosmiconfig: "npm:^9.0.0" css-functions-list: "npm:^3.2.3" - css-tree: "npm:^3.0.0" + css-tree: "npm:^3.0.1" debug: "npm:^4.3.7" fast-glob: "npm:^3.3.2" fastest-levenshtein: "npm:^1.0.16" @@ -6740,16 +6721,16 @@ __metadata: ignore: "npm:^6.0.2" imurmurhash: "npm:^0.1.4" is-plain-object: "npm:^5.0.0" - known-css-properties: "npm:^0.34.0" + known-css-properties: "npm:^0.35.0" mathml-tag-names: "npm:^2.1.3" meow: "npm:^13.2.0" micromatch: "npm:^4.0.8" normalize-path: "npm:^3.0.0" - picocolors: "npm:^1.0.1" - postcss: "npm:^8.4.47" + picocolors: "npm:^1.1.1" + postcss: "npm:^8.4.49" postcss-resolve-nested-selector: "npm:^0.1.6" postcss-safe-parser: "npm:^7.0.1" - postcss-selector-parser: "npm:^6.1.2" + postcss-selector-parser: "npm:^7.0.0" postcss-value-parser: "npm:^4.2.0" resolve-from: "npm:^5.0.0" string-width: "npm:^4.2.3" @@ -6759,7 +6740,7 @@ __metadata: write-file-atomic: "npm:^5.0.1" bin: stylelint: bin/stylelint.mjs - checksum: 10c0/d07dd156c225d16c740995daacd78090f7fc317602e87bda2fca323a4ae427a8526d724f3089df3b2185df4520f987547668ceea9b30985988ccbc514034aa21 + checksum: 10c0/65638247fb4e5eacb032e3a98412a13ad8b343d2d58e22d61b96ada72808b5b7e736c845937b3bcfde04c0bfa2120383b507e530afe876dafe824a93c337258f languageName: node linkType: hard From a73f65f4b122e5061a7abf37ca1cf5669b90198c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:46:18 -0700 Subject: [PATCH 07/12] Update eslint monorepo to v9.16.0 (#10020) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 02976322bb18..bfcb2bd931a2 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ "@babel/cli": "7.25.9", "@babel/core": "7.26.0", "@babel/preset-env": "7.26.0", - "@eslint/js": "9.15.0", + "@eslint/js": "9.16.0", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", - "eslint": "9.15.0", + "eslint": "9.16.0", "eslint-config-prettier": "9.1.0", "eslint-formatter-checkstyle": "8.40.0", "globals": "15.12.0", diff --git a/yarn.lock b/yarn.lock index 14a7d43ce2ba..1597ad34a3b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1706,10 +1706,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:9.15.0": - version: 9.15.0 - resolution: "@eslint/js@npm:9.15.0" - checksum: 10c0/56552966ab1aa95332f70d0e006db5746b511c5f8b5e0c6a9b2d6764ff6d964e0b2622731877cbc4e3f0e74c5b39191290d5f48147be19175292575130d499ab +"@eslint/js@npm:9.16.0": + version: 9.16.0 + resolution: "@eslint/js@npm:9.16.0" + checksum: 10c0/a55846a4ddade720662d36682f3eaaf38eac06eeee12c83bb837bba2b7d550dadcb3445b104219f0bc1da2e09b4fe5fb5ba123b8338c8c787bcfbd540878df75 languageName: node linkType: hard @@ -3507,16 +3507,16 @@ __metadata: languageName: node linkType: hard -"eslint@npm:9.15.0": - version: 9.15.0 - resolution: "eslint@npm:9.15.0" +"eslint@npm:9.16.0": + version: 9.16.0 + resolution: "eslint@npm:9.16.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/regexpp": "npm:^4.12.1" "@eslint/config-array": "npm:^0.19.0" "@eslint/core": "npm:^0.9.0" "@eslint/eslintrc": "npm:^3.2.0" - "@eslint/js": "npm:9.15.0" + "@eslint/js": "npm:9.16.0" "@eslint/plugin-kit": "npm:^0.2.3" "@humanfs/node": "npm:^0.16.6" "@humanwhocodes/module-importer": "npm:^1.0.1" @@ -3552,7 +3552,7 @@ __metadata: optional: true bin: eslint: bin/eslint.js - checksum: 10c0/d0d7606f36bfcccb1c3703d0a24df32067b207a616f17efe5fb1765a91d13f085afffc4fc97ecde4ab9c9f4edd64d9b4ce750e13ff7937a25074b24bee15b20f + checksum: 10c0/f36d12652c6f20bab8a77375b8ad29a6af030c3840deb0a5f9dd4cee49d68a2d68d7dc73b0c25918df59d83cd686dd5712e11387e696e1f3842e8dde15cd3255 languageName: node linkType: hard @@ -4372,12 +4372,12 @@ __metadata: "@babel/cli": "npm:7.25.9" "@babel/core": "npm:7.26.0" "@babel/preset-env": "npm:7.26.0" - "@eslint/js": "npm:9.15.0" + "@eslint/js": "npm:9.16.0" babel-loader: "npm:9.2.1" clean-webpack-plugin: "npm:4.0.0" css-loader: "npm:7.1.2" css-minimizer-webpack-plugin: "npm:7.0.0" - eslint: "npm:9.15.0" + eslint: "npm:9.16.0" eslint-config-prettier: "npm:9.1.0" eslint-formatter-checkstyle: "npm:8.40.0" globals: "npm:15.12.0" From 7d658255f8c0aaeaab99f3c71eeee502ccfde15b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:46:48 -0700 Subject: [PATCH 08/12] Update dependency com.puppycrawl.tools:checkstyle to v10.20.2 (#10015) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8543045f068e..9fb6f5288876 100644 --- a/pom.xml +++ b/pom.xml @@ -281,7 +281,7 @@ THE SOFTWARE. com.puppycrawl.tools checkstyle - 10.20.1 + 10.20.2 From e994d293e0cf0d67988878cf63a8d5419f83df3c Mon Sep 17 00:00:00 2001 From: Stefan Spieker Date: Tue, 3 Dec 2024 10:14:42 +0100 Subject: [PATCH 09/12] Fixed spotbugs `PATH_TRAVERSAL_IN` issue in `FileBoolean` (#9638) Co-authored-by: Mark Waite --- core/src/main/java/jenkins/util/io/FileBoolean.java | 3 ++- core/src/spotbugs/excludesFilter.xml | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/jenkins/util/io/FileBoolean.java b/core/src/main/java/jenkins/util/io/FileBoolean.java index 82fe7f9b29fc..c6be6c5ef6e4 100644 --- a/core/src/main/java/jenkins/util/io/FileBoolean.java +++ b/core/src/main/java/jenkins/util/io/FileBoolean.java @@ -8,6 +8,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; +import org.apache.commons.io.FilenameUtils; /** * Uses a presence/absence of a file as a persisted boolean storage. @@ -29,7 +30,7 @@ public FileBoolean(File file) { } public FileBoolean(Class owner, String name) { - this(new File(Jenkins.get().getRootDir(), owner.getName().replace('$', '.') + '/' + name)); + this(new File(Jenkins.get().getRootDir(), FilenameUtils.getName(owner.getName().replace('$', '.') + '/' + name))); } /** diff --git a/core/src/spotbugs/excludesFilter.xml b/core/src/spotbugs/excludesFilter.xml index 7d36952fc372..eed82962bded 100644 --- a/core/src/spotbugs/excludesFilter.xml +++ b/core/src/spotbugs/excludesFilter.xml @@ -407,7 +407,6 @@ - From 82735d468ee0de1c5177ba0a214597447010abdb Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:54:11 +0000 Subject: [PATCH 10/12] [maven-release-plugin] prepare release jenkins-2.488 --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 6 +++--- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty12-ee9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 61de025b3e9b..b99c63b58973 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 2473629d23cc..447172e9fb49 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 cli diff --git a/core/pom.xml b/core/pom.xml index 9bff5e5ad0b2..bb25722d973f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index fe1e89a120dc..15f505fd717d 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 jenkins-coverage diff --git a/pom.xml b/pom.xml index 9fb6f5288876..756cbbeb35eb 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 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.488 https://github.com/jenkinsci/jenkins @@ -75,7 +75,7 @@ THE SOFTWARE. 2.488 -SNAPSHOT - 2024-11-25T19:14:52Z + 2024-12-03T10:33:21Z github diff --git a/test/pom.xml b/test/pom.xml index 50111b234ab0..de68a03da988 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 181ed70b4de5..2ce715e4ec60 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 jenkins-war diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml index 2253163b3c4c..4f647bf17393 100644 --- a/websocket/jetty12-ee9/pom.xml +++ b/websocket/jetty12-ee9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - ${revision}${changelist} + 2.488 ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 178413f92c8e..80cc80513858 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.488 ../.. From 4248fc0ca6ce108364ed23208063ff20753f5e70 Mon Sep 17 00:00:00 2001 From: Jenkins Release Bot <66998184+jenkins-release-bot@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:54:30 +0000 Subject: [PATCH 11/12] [maven-release-plugin] prepare for next development iteration --- bom/pom.xml | 2 +- cli/pom.xml | 2 +- core/pom.xml | 2 +- coverage/pom.xml | 2 +- pom.xml | 8 ++++---- test/pom.xml | 2 +- war/pom.xml | 2 +- websocket/jetty12-ee9/pom.xml | 2 +- websocket/spi/pom.xml | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index b99c63b58973..61de025b3e9b 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} jenkins-bom diff --git a/cli/pom.xml b/cli/pom.xml index 447172e9fb49..2473629d23cc 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} cli diff --git a/core/pom.xml b/core/pom.xml index bb25722d973f..9bff5e5ad0b2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} jenkins-core diff --git a/coverage/pom.xml b/coverage/pom.xml index 15f505fd717d..fe1e89a120dc 100644 --- a/coverage/pom.xml +++ b/coverage/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} jenkins-coverage diff --git a/pom.xml b/pom.xml index 756cbbeb35eb..1f2fe1927dc7 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.488 + ${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.488 + ${scmTag} https://github.com/jenkinsci/jenkins @@ -73,9 +73,9 @@ THE SOFTWARE. - 2.488 + 2.489 -SNAPSHOT - 2024-12-03T10:33:21Z + 2024-12-03T13:54:11Z github diff --git a/test/pom.xml b/test/pom.xml index de68a03da988..50111b234ab0 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} jenkins-test diff --git a/war/pom.xml b/war/pom.xml index 2ce715e4ec60..181ed70b4de5 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} jenkins-war diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml index 4f647bf17393..2253163b3c4c 100644 --- a/websocket/jetty12-ee9/pom.xml +++ b/websocket/jetty12-ee9/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} ../.. diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml index 80cc80513858..178413f92c8e 100644 --- a/websocket/spi/pom.xml +++ b/websocket/spi/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main jenkins-parent - 2.488 + ${revision}${changelist} ../.. From 171df4d1057876cfe860f6ccf682c56b362c527b Mon Sep 17 00:00:00 2001 From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Date: Wed, 4 Dec 2024 13:34:51 +0100 Subject: [PATCH 12/12] Revert "Fixed spotbugs `PATH_TRAVERSAL_IN` issue in `FileBoolean`" (#10022) Revert "Fixed spotbugs `PATH_TRAVERSAL_IN` issue in `FileBoolean` (#9638)" This reverts commit e994d293e0cf0d67988878cf63a8d5419f83df3c. --- core/src/main/java/jenkins/util/io/FileBoolean.java | 3 +-- core/src/spotbugs/excludesFilter.xml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/jenkins/util/io/FileBoolean.java b/core/src/main/java/jenkins/util/io/FileBoolean.java index c6be6c5ef6e4..82fe7f9b29fc 100644 --- a/core/src/main/java/jenkins/util/io/FileBoolean.java +++ b/core/src/main/java/jenkins/util/io/FileBoolean.java @@ -8,7 +8,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.Jenkins; -import org.apache.commons.io.FilenameUtils; /** * Uses a presence/absence of a file as a persisted boolean storage. @@ -30,7 +29,7 @@ public FileBoolean(File file) { } public FileBoolean(Class owner, String name) { - this(new File(Jenkins.get().getRootDir(), FilenameUtils.getName(owner.getName().replace('$', '.') + '/' + name))); + this(new File(Jenkins.get().getRootDir(), owner.getName().replace('$', '.') + '/' + name)); } /** diff --git a/core/src/spotbugs/excludesFilter.xml b/core/src/spotbugs/excludesFilter.xml index eed82962bded..7d36952fc372 100644 --- a/core/src/spotbugs/excludesFilter.xml +++ b/core/src/spotbugs/excludesFilter.xml @@ -407,6 +407,7 @@ +