From 7b8de1eed66e5db3136a9451d04a729ab888b340 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 13 Oct 2024 22:29:34 +0100
Subject: [PATCH 01/18] Update dependency
org.jenkins-ci.plugins:display-url-api to v2.209.v582ed814ff2f (#9859)
Co-authored-by: renovate[bot] <29139614+renovate[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 c36a43f5b255..6bf29cc3138d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -106,7 +106,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
display-url-api
- 2.204.vf6fddd8a_8b_e9
+ 2.209.v582ed814ff2f
diff --git a/war/pom.xml b/war/pom.xml
index 27fd0307aead..b5cb11d590e5 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -272,7 +272,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
display-url-api
- 2.204.vf6fddd8a_8b_e9
+ 2.209.v582ed814ff2f
hpi
From b760de102d3ea855d5da11a8e32cb9f8275ce9b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 13 Oct 2024 22:29:41 +0100
Subject: [PATCH 02/18] Update dependency postcss-preset-env to v10.0.7 (#9864)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 392 ++++++++++++++++++++++++++-------------------------
2 files changed, 202 insertions(+), 192 deletions(-)
diff --git a/package.json b/package.json
index 1e9ae7d9161e..227a2af99afc 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
"mini-css-extract-plugin": "2.9.1",
"postcss": "8.4.47",
"postcss-loader": "8.1.1",
- "postcss-preset-env": "10.0.6",
+ "postcss-preset-env": "10.0.7",
"postcss-scss": "4.0.9",
"prettier": "3.3.3",
"sass": "1.79.4",
diff --git a/yarn.lock b/yarn.lock
index c2f3678b1cc0..c6411d260d5e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1340,13 +1340,13 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/cascade-layer-name-parser@npm:^2.0.1":
- version: 2.0.1
- resolution: "@csstools/cascade-layer-name-parser@npm:2.0.1"
+"@csstools/cascade-layer-name-parser@npm:^2.0.2":
+ version: 2.0.2
+ resolution: "@csstools/cascade-layer-name-parser@npm:2.0.2"
peerDependencies:
- "@csstools/css-parser-algorithms": ^3.0.1
- "@csstools/css-tokenizer": ^3.0.1
- checksum: 10c0/e1f9030285d1a16ca0424018289e5288e58dee2d6f6cc392e27d9e8eca0deeea4ced9b749eef09a8322746cb15b6304bc7e2d04bb9dc7405c29b3717ec80e736
+ "@csstools/css-parser-algorithms": ^3.0.2
+ "@csstools/css-tokenizer": ^3.0.2
+ checksum: 10c0/2cc840445328400bb3e1e4186e6081e6519a23d9abde36a16c95892b6ad75155b3af3410d79fdda1c53a068384f970cabff4b5f5ba6867578168cbd3419016c8
languageName: node
linkType: hard
@@ -1357,42 +1357,42 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/css-calc@npm:^2.0.1":
- version: 2.0.1
- resolution: "@csstools/css-calc@npm:2.0.1"
+"@csstools/css-calc@npm:^2.0.2":
+ version: 2.0.2
+ resolution: "@csstools/css-calc@npm:2.0.2"
peerDependencies:
- "@csstools/css-parser-algorithms": ^3.0.1
- "@csstools/css-tokenizer": ^3.0.1
- checksum: 10c0/84c0ba3dac51466c9ac22c3540360f6058cf351a3676d71d4412584b165a91abc7c69a4ddf5a5dacc6e6082806d2317cf50ddbc0a0562275b2aedaee41cb87a9
+ "@csstools/css-parser-algorithms": ^3.0.2
+ "@csstools/css-tokenizer": ^3.0.2
+ checksum: 10c0/b36e655b4abc8ea39b300725e33cd43b1875d759dd60bee8155bf7841065615a7f24cf53199382e30aa10bb137f64021043e4af7e11b7199b674a6e6cf3ccd01
languageName: node
linkType: hard
-"@csstools/css-color-parser@npm:^3.0.2":
- version: 3.0.2
- resolution: "@csstools/css-color-parser@npm:3.0.2"
+"@csstools/css-color-parser@npm:^3.0.3":
+ version: 3.0.3
+ resolution: "@csstools/css-color-parser@npm:3.0.3"
dependencies:
"@csstools/color-helpers": "npm:^5.0.1"
- "@csstools/css-calc": "npm:^2.0.1"
+ "@csstools/css-calc": "npm:^2.0.2"
peerDependencies:
- "@csstools/css-parser-algorithms": ^3.0.1
- "@csstools/css-tokenizer": ^3.0.1
- checksum: 10c0/31f42cc22426c937f5c6999889f72b40aec8504189a6badf3319552f27a5af73dd5f46be9ebc54eb87e526468eb2546ffbd60a6879fe599efa6c98e51d6cfa3d
+ "@csstools/css-parser-algorithms": ^3.0.2
+ "@csstools/css-tokenizer": ^3.0.2
+ checksum: 10c0/02367ffc222254132c47f9cbc856f65fe0b81ee4a5e7381251b95c4064138b5ed99a5e5a79c0c8689f9e75e3d900f94773258a161a97f467c3f0420838c10e04
languageName: node
linkType: hard
-"@csstools/css-parser-algorithms@npm:^3.0.1":
- version: 3.0.1
- resolution: "@csstools/css-parser-algorithms@npm:3.0.1"
+"@csstools/css-parser-algorithms@npm:^3.0.1, @csstools/css-parser-algorithms@npm:^3.0.2":
+ version: 3.0.2
+ resolution: "@csstools/css-parser-algorithms@npm:3.0.2"
peerDependencies:
- "@csstools/css-tokenizer": ^3.0.1
- checksum: 10c0/064c6d519197b5af43bbf5efe8f4cdbd361b006113aa82160d637e925b50c643a52d33d512ca01c63042d952d723a2a10798231a714668356b76668fb11294e3
+ "@csstools/css-tokenizer": ^3.0.2
+ checksum: 10c0/246afbf518ee9eaa24ed7f083360eb66884f1172fd4f8c663bff8c6099de2a8abd1e2a31d5b6fe42e010277d238469d780cff62bc7fdc6a52e7a90626b8924dc
languageName: node
linkType: hard
-"@csstools/css-tokenizer@npm:^3.0.1":
- version: 3.0.1
- resolution: "@csstools/css-tokenizer@npm:3.0.1"
- checksum: 10c0/c9ed4373e5731b5375ea9791590081019c04e95f08b46b272977e5e7b8c3d560affc62e82263cb8def1df1e57f0673140e7e16a14a5e7be04e6a234be088d1d3
+"@csstools/css-tokenizer@npm:^3.0.1, @csstools/css-tokenizer@npm:^3.0.2":
+ version: 3.0.2
+ resolution: "@csstools/css-tokenizer@npm:3.0.2"
+ checksum: 10c0/a74e5829420ed35982fd33be272c2a19cb2380179d357abe750aa848be6d6699d0437008f47a57eb7c6ff64a34b0c8f91a97dd63dbddd08249b7cf7983767e5e
languageName: node
linkType: hard
@@ -1406,6 +1406,16 @@ __metadata:
languageName: node
linkType: hard
+"@csstools/media-query-list-parser@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@csstools/media-query-list-parser@npm:4.0.0"
+ peerDependencies:
+ "@csstools/css-parser-algorithms": ^3.0.2
+ "@csstools/css-tokenizer": ^3.0.2
+ checksum: 10c0/416417bcfd84c18a2df8dc77f31c87830e151dc20530fe7f0d8f13a0848b1a9090858abdf7792d82bf2edb41ddedb7b57b34eb78b68b5c10755ae02c019e496a
+ languageName: node
+ linkType: hard
+
"@csstools/postcss-cascade-layers@npm:^5.0.0":
version: 5.0.0
resolution: "@csstools/postcss-cascade-layers@npm:5.0.0"
@@ -1418,60 +1428,60 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-color-function@npm:^4.0.2":
- version: 4.0.2
- resolution: "@csstools/postcss-color-function@npm:4.0.2"
+"@csstools/postcss-color-function@npm:^4.0.3":
+ version: 4.0.3
+ resolution: "@csstools/postcss-color-function@npm:4.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/c987ccc7ab326668895396d3fe69c05087cf6e245be6f70e8c33da0cdeb56f8ac3d117cfad984191ec57be9691ab56d427aaa28c61c4a7446521972993dd5039
+ checksum: 10c0/c994660ca0e2652755d9ad181c8cb46a07220c972086c97c843fa9bacf690be10c642770f898aeec4acc47c2b718dfc7372107285a678361f34d84d9e9c11e0c
languageName: node
linkType: hard
-"@csstools/postcss-color-mix-function@npm:^3.0.2":
- version: 3.0.2
- resolution: "@csstools/postcss-color-mix-function@npm:3.0.2"
+"@csstools/postcss-color-mix-function@npm:^3.0.3":
+ version: 3.0.3
+ resolution: "@csstools/postcss-color-mix-function@npm:3.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/cfdc641f504f9d02b9a7b53d6bd933d4e767ecaee5f3d2df45d897f69b8a38b5b79b538d307b16fb56dcb7c19dc7e107518c356772e89771e28e04fd846d9035
+ checksum: 10c0/4ba358eb9030fc485bfe2922d897eeb712725762cc399eaba60ba665c84dc3e56a4d5a52dfb320093c0b217d32fedb9b5197fa45738cade53d9afcbefdadf04f
languageName: node
linkType: hard
-"@csstools/postcss-content-alt-text@npm:^2.0.1":
- version: 2.0.1
- resolution: "@csstools/postcss-content-alt-text@npm:2.0.1"
+"@csstools/postcss-content-alt-text@npm:^2.0.2":
+ version: 2.0.2
+ resolution: "@csstools/postcss-content-alt-text@npm:2.0.2"
dependencies:
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/693e4cfa9a30a9c384120bd24846a7cd5ba1e1ebf975eb81b0e0131a21ac28a0301c7dcfa13706bc7d8b5343536fb43a46de636c3257d0fd05041c7255366e87
+ checksum: 10c0/e52d40f6567b9b23b32a6c40f9b2a74d57f99a9921b4cae015f51f72453474236c760bb13120682f8815698a615e0ad7bed22314c29dca89c34b5480d83a7a6d
languageName: node
linkType: hard
-"@csstools/postcss-exponential-functions@npm:^2.0.1":
- version: 2.0.1
- resolution: "@csstools/postcss-exponential-functions@npm:2.0.1"
+"@csstools/postcss-exponential-functions@npm:^2.0.2":
+ version: 2.0.2
+ resolution: "@csstools/postcss-exponential-functions@npm:2.0.2"
dependencies:
- "@csstools/css-calc": "npm:^2.0.1"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-calc": "npm:^2.0.2"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/ddcaedfa48cc0cf93611c8d2ed5a75d56c1d196a97015db644b45881adabb47f3255242acaef6ea869a1e5ba66328725d254bf6d29eb5e988cde8b040bc5f55d
+ checksum: 10c0/034ff89089872f63a6b00bda670c5ff11361babd221ed3e441dde969a718059e5d44ab0ed331868f137bb205331b808ecbcc4cb641d5c945238ebca28aa3ed59
languageName: node
linkType: hard
@@ -1487,46 +1497,46 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-gamut-mapping@npm:^2.0.2":
- version: 2.0.2
- resolution: "@csstools/postcss-gamut-mapping@npm:2.0.2"
+"@csstools/postcss-gamut-mapping@npm:^2.0.3":
+ version: 2.0.3
+ resolution: "@csstools/postcss-gamut-mapping@npm:2.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/8b6504f81c5036e3c2a9f9516c371f48a283112469b746546c8c7f6f0da2467c915d4dac6dfe8bb05d7dab3a7503911391eb9e666cb7632e09a032e801c029f5
+ checksum: 10c0/21f5708f63e9c3b7603f8b72b5f288e0a021e9710a6abf4aaa713ff4d04bae057d1861e1f28d7670ea39ba463ac04f1507876d4a11178934e7cc7a1c6a780084
languageName: node
linkType: hard
-"@csstools/postcss-gradients-interpolation-method@npm:^5.0.2":
- version: 5.0.2
- resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.2"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.3":
+ version: 5.0.3
+ resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/4fa27437ad9861b1457c28228f2503c17bcc2f77dcb38da1314a4a5d38fd010e7e5d11b5f9d69e0a2cb2999bbfeca1e99ce2f59422bda5b382658dcb03f7326e
+ checksum: 10c0/062d27148438309c940a1973bfc7d42a06caa9397bf2382c7a61979f5be3d6f3fae1bc8ddf94d2dd8e6c807e0530a9e76179510266aaddc439677bf79447a765
languageName: node
linkType: hard
-"@csstools/postcss-hwb-function@npm:^4.0.2":
- version: 4.0.2
- resolution: "@csstools/postcss-hwb-function@npm:4.0.2"
+"@csstools/postcss-hwb-function@npm:^4.0.3":
+ version: 4.0.3
+ resolution: "@csstools/postcss-hwb-function@npm:4.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/46dc9596e37830de4c38f70764d6da9f2fc7bc339217b4291eced75daa8998c4e05fb743c271701e44818df4ac111c285019b7bb3a728e8b61d86899bbeb74eb
+ checksum: 10c0/faf2bfbafeec765391e37c7a5cbc7b4647d9ab1ffa51e922c7dfffa545c3d436d15604dfdfb9d7684e760042e62bb42e0243dd4ebd8c3c14694a9f7be4e57b30
languageName: node
linkType: hard
@@ -1564,17 +1574,17 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-light-dark-function@npm:^2.0.4":
- version: 2.0.4
- resolution: "@csstools/postcss-light-dark-function@npm:2.0.4"
+"@csstools/postcss-light-dark-function@npm:^2.0.5":
+ version: 2.0.5
+ resolution: "@csstools/postcss-light-dark-function@npm:2.0.5"
dependencies:
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/0176422ad9747953964b1ceff002df1ecb1952ebc481db6192070d68777135b582ea6fd32ae819b9c64c96cb9170bd6907c647c85b48daa4984b7ed3d7f9bccb
+ checksum: 10c0/80635ee312d2a8f42aa5ce6792f1dc4a71199c384c66a3270d37e998d96db55beaa6836d689cda3b7e4828227960582fae04659ba5e4e0f64fd4543cbf15c6ab
languageName: node
linkType: hard
@@ -1616,42 +1626,42 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-logical-viewport-units@npm:^3.0.1":
- version: 3.0.1
- resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.1"
+"@csstools/postcss-logical-viewport-units@npm:^3.0.2":
+ version: 3.0.2
+ resolution: "@csstools/postcss-logical-viewport-units@npm:3.0.2"
dependencies:
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/f54f91ec4d308562371576e82131c3cc1ff461a951c9a38f0b42b783c26f37a93cc846fcd025d3c4a8437b55a4fff1192ebfac8ccf84abb6478b2c515d232552
+ checksum: 10c0/31f525e774bc053f545a159eb53bb21465ea2930118e87c40207ad90fa97d3151e6de83efd02f84803fb0e93ed4a4b42a3904b734423410e73ac4c6ce9666ab4
languageName: node
linkType: hard
-"@csstools/postcss-media-minmax@npm:^2.0.1":
- version: 2.0.1
- resolution: "@csstools/postcss-media-minmax@npm:2.0.1"
+"@csstools/postcss-media-minmax@npm:^2.0.2":
+ version: 2.0.2
+ resolution: "@csstools/postcss-media-minmax@npm:2.0.2"
dependencies:
- "@csstools/css-calc": "npm:^2.0.1"
- "@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/css-calc": "npm:^2.0.2"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
+ "@csstools/media-query-list-parser": "npm:^4.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/23c1fb0c3ed8bf82f3223f161d0d65ba62045b917bc19624581f64aaa5d678485d22c23af2591a3f634ba02030ccb419c2b30209aa22f9fd2baa1a6474af810a
+ checksum: 10c0/83cf10742884fca3baa7ae26e2cb34123ce5a022622390566c139b4587ea8583fab00acbb85545786b36398e2201d2a94301e0fae805e55f375f1b5c38f67ce8
languageName: node
linkType: hard
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.1":
- version: 3.0.1
- resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.1"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^3.0.2":
+ version: 3.0.2
+ resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:3.0.2"
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/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
+ "@csstools/media-query-list-parser": "npm:^4.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/e491cb149fb4fff85b2f03191511e43654ae00716e3c1ea9f1dc22ec4e7042c35f034d372082a69d3621c86cafbe46e8f419872fa36f4a534f145f584d655768
+ checksum: 10c0/3ac4073d2e958bfb24ae45f673070dd805f0fcf07bc8d00a9a98f596d1096e7be282c8d8e87df3abde90f33fcbe2c7705e972b8c1a58e43ec44729f470b76096
languageName: node
linkType: hard
@@ -1678,18 +1688,18 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-oklab-function@npm:^4.0.2":
- version: 4.0.2
- resolution: "@csstools/postcss-oklab-function@npm:4.0.2"
+"@csstools/postcss-oklab-function@npm:^4.0.3":
+ version: 4.0.3
+ resolution: "@csstools/postcss-oklab-function@npm:4.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/3209a7cec6d3577544a7ef41f2d5cca25f77891d4ec0d7f39d32f9a79a6c9a9b0ee6b54b2937a2d995548ad11c39966b07d4b9f58e907ffbe1a4b454f2d277f3
+ checksum: 10c0/650bcb4f664308972588a8f789f806d63c4069e2e008cfc3b5c80bf9df992c62972dce279b8f434c7f78823e97095942ee4f0e37bc549258887213e72acb7ef8
languageName: node
linkType: hard
@@ -1704,18 +1714,18 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-relative-color-syntax@npm:^3.0.2":
- version: 3.0.2
- resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.2"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.3":
+ version: 3.0.3
+ resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/34a8c999e08c6e7833484ee2fb91e7fcc25235d6c361712fed581e44a5a29f1ceb95415b6f4260de53809ac13f5da5415d1905c2971477cf5d45e5196081c663
+ checksum: 10c0/c241fe6b725d775f6d2085be1dff3868d189b176fa91ab1eb1133e30e30c8151bded4e50d17a845edd0bdd0a7adf9e8883cb2634fea3394872591fe9ad2a7e86
languageName: node
linkType: hard
@@ -1730,16 +1740,16 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-stepped-value-functions@npm:^4.0.1":
- version: 4.0.1
- resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.1"
+"@csstools/postcss-stepped-value-functions@npm:^4.0.2":
+ version: 4.0.2
+ resolution: "@csstools/postcss-stepped-value-functions@npm:4.0.2"
dependencies:
- "@csstools/css-calc": "npm:^2.0.1"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-calc": "npm:^2.0.2"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/7e65969b124fce603675ca17c2ffa2bb456677866e54bc9fbdc4da0945be1593fde2abb0730d3d03190776ad2022b394a1f9d4834c5b1f4c7ec497929fd35f8f
+ checksum: 10c0/444a27d725bc7a8e1554469e8ac69e248ff525b728fbe058523b0f1aefcff80ca707f543d21fead0a22d51603b1669190fb01f0f2dcd599a01768a37e0d62bc3
languageName: node
linkType: hard
@@ -1755,16 +1765,16 @@ __metadata:
languageName: node
linkType: hard
-"@csstools/postcss-trigonometric-functions@npm:^4.0.1":
- version: 4.0.1
- resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.1"
+"@csstools/postcss-trigonometric-functions@npm:^4.0.2":
+ version: 4.0.2
+ resolution: "@csstools/postcss-trigonometric-functions@npm:4.0.2"
dependencies:
- "@csstools/css-calc": "npm:^2.0.1"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-calc": "npm:^2.0.2"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/59e017ebb9f4f8f027e134024e3322b5e202cc96073e0bb0d45733a829c8eadc7f4f7ce57ce8360a748a677595af9ea95da1779684699b48b911b73b4017ac8b
+ checksum: 10c0/eaecb2ea891162e4fcbbccf4f660c99e9e59f21937b70fe6aec3b51441eff2a12c1a2dc13fff426722629a7929919fd866311eaa68d74ee9d1f5387a23502fe2
languageName: node
linkType: hard
@@ -4427,7 +4437,7 @@ __metadata:
mini-css-extract-plugin: "npm:2.9.1"
postcss: "npm:8.4.47"
postcss-loader: "npm:8.1.1"
- postcss-preset-env: "npm:10.0.6"
+ postcss-preset-env: "npm:10.0.7"
postcss-scss: "npm:4.0.9"
prettier: "npm:3.3.3"
sass: "npm:1.79.4"
@@ -5365,18 +5375,18 @@ __metadata:
languageName: node
linkType: hard
-"postcss-color-functional-notation@npm:^7.0.2":
- version: 7.0.2
- resolution: "postcss-color-functional-notation@npm:7.0.2"
+"postcss-color-functional-notation@npm:^7.0.3":
+ version: 7.0.3
+ resolution: "postcss-color-functional-notation@npm:7.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/e89c0bff94558b0c978ac36f7e02f7f516291f90fd43169d39c63ad2bb0415e3b1c4b3c2469280d578727e850fdf15a557230cb28275f3f0676f0f73187f2867
+ checksum: 10c0/5e04c81002512c960784043c096bc91ebc76b8fddb9259a2418b0e121eb65042944cc0f78946f6b7e5774ff1fee087849019655e4848af1f88879e3ab9ff7c17
languageName: node
linkType: hard
@@ -5430,46 +5440,46 @@ __metadata:
languageName: node
linkType: hard
-"postcss-custom-media@npm:^11.0.2":
- version: 11.0.2
- resolution: "postcss-custom-media@npm:11.0.2"
+"postcss-custom-media@npm:^11.0.3":
+ version: 11.0.3
+ resolution: "postcss-custom-media@npm:11.0.3"
dependencies:
- "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
- "@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/cascade-layer-name-parser": "npm:^2.0.2"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
+ "@csstools/media-query-list-parser": "npm:^4.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/7bec2b1e0b5d786c33c5715b611ffc8b9737252ee6bf77ca59255ac16f91ce614406923f43250e5c88b04f1bb050f155dc5ed4d9350dbd704c45fbd72e5a9a04
+ checksum: 10c0/bd3f0cf17d7422385d26afed510dc2acebb1d8c25fce13e2bbee1c49cdc7fe95ebe7f50b89ef0a88ebdd5f6826e89d99e26b905881ceff788df655670dba93d8
languageName: node
linkType: hard
-"postcss-custom-properties@npm:^14.0.1":
- version: 14.0.1
- resolution: "postcss-custom-properties@npm:14.0.1"
+"postcss-custom-properties@npm:^14.0.2":
+ version: 14.0.2
+ resolution: "postcss-custom-properties@npm:14.0.2"
dependencies:
- "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/cascade-layer-name-parser": "npm:^2.0.2"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/utilities": "npm:^2.0.0"
postcss-value-parser: "npm:^4.2.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/12180a7f4a4fe2d528387346a1810b82ed870081756dcf6be226c839716ab3f6f4d6ca4c7208a07d7d84bf2c986beef6473e29964e7c2572066fca5d3b000ed5
+ checksum: 10c0/ea2e0cb60c558bb1afb4e601dcc64a38e1b28e5df3e47b83b858fc12d909d0e3453013e6b368fc05a7db7098ffcdc702a30a92f1a3c0ef67dfb97bf089021f1a
languageName: node
linkType: hard
-"postcss-custom-selectors@npm:^8.0.1":
- version: 8.0.1
- resolution: "postcss-custom-selectors@npm:8.0.1"
+"postcss-custom-selectors@npm:^8.0.2":
+ version: 8.0.2
+ resolution: "postcss-custom-selectors@npm:8.0.2"
dependencies:
- "@csstools/cascade-layer-name-parser": "npm:^2.0.1"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/cascade-layer-name-parser": "npm:^2.0.2"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
postcss-selector-parser: "npm:^6.1.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/b867233b3d68fbab90afca8a776eb74196ebc3fac8988175d95118a47993c793138fec6cc580272bb35d9bd31086acbdd33ff86da0cab83ef2f08bfc1c23ecd6
+ checksum: 10c0/81673ffb0874f63c0f5e14315a5808259ec80ae8452aaf10d28112d30a9aaabbf61d13edb02f8be2965f44b943968c7eda051a1693da436ef157e77fcff0d752
languageName: node
linkType: hard
@@ -5587,18 +5597,18 @@ __metadata:
languageName: node
linkType: hard
-"postcss-lab-function@npm:^7.0.2":
- version: 7.0.2
- resolution: "postcss-lab-function@npm:7.0.2"
+"postcss-lab-function@npm:^7.0.3":
+ version: 7.0.3
+ resolution: "postcss-lab-function@npm:7.0.3"
dependencies:
- "@csstools/css-color-parser": "npm:^3.0.2"
- "@csstools/css-parser-algorithms": "npm:^3.0.1"
- "@csstools/css-tokenizer": "npm:^3.0.1"
+ "@csstools/css-color-parser": "npm:^3.0.3"
+ "@csstools/css-parser-algorithms": "npm:^3.0.2"
+ "@csstools/css-tokenizer": "npm:^3.0.2"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
"@csstools/utilities": "npm:^2.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/6b2be7e762b4ccb58ea9051723d390f6732ad78bb30bfef9499139cf5e2ac160c3de31b2b005fcc30e9fced4abe1685df6cb76c99d548896bae6746105ac8520
+ checksum: 10c0/c50a73a9ed54b4194998c4627599d1f42074235f572edbbcdb0e00717f3ae2121dc8378d917792b281860c5650a617d923823da6f395515f610b5760d115354d
languageName: node
linkType: hard
@@ -5915,39 +5925,39 @@ __metadata:
languageName: node
linkType: hard
-"postcss-preset-env@npm:10.0.6":
- version: 10.0.6
- resolution: "postcss-preset-env@npm:10.0.6"
+"postcss-preset-env@npm:10.0.7":
+ version: 10.0.7
+ resolution: "postcss-preset-env@npm:10.0.7"
dependencies:
"@csstools/postcss-cascade-layers": "npm:^5.0.0"
- "@csstools/postcss-color-function": "npm:^4.0.2"
- "@csstools/postcss-color-mix-function": "npm:^3.0.2"
- "@csstools/postcss-content-alt-text": "npm:^2.0.1"
- "@csstools/postcss-exponential-functions": "npm:^2.0.1"
+ "@csstools/postcss-color-function": "npm:^4.0.3"
+ "@csstools/postcss-color-mix-function": "npm:^3.0.3"
+ "@csstools/postcss-content-alt-text": "npm:^2.0.2"
+ "@csstools/postcss-exponential-functions": "npm:^2.0.2"
"@csstools/postcss-font-format-keywords": "npm:^4.0.0"
- "@csstools/postcss-gamut-mapping": "npm:^2.0.2"
- "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.2"
- "@csstools/postcss-hwb-function": "npm:^4.0.2"
+ "@csstools/postcss-gamut-mapping": "npm:^2.0.3"
+ "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.3"
+ "@csstools/postcss-hwb-function": "npm:^4.0.3"
"@csstools/postcss-ic-unit": "npm:^4.0.0"
"@csstools/postcss-initial": "npm:^2.0.0"
"@csstools/postcss-is-pseudo-class": "npm:^5.0.0"
- "@csstools/postcss-light-dark-function": "npm:^2.0.4"
+ "@csstools/postcss-light-dark-function": "npm:^2.0.5"
"@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
"@csstools/postcss-logical-overflow": "npm:^2.0.0"
"@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
"@csstools/postcss-logical-resize": "npm:^3.0.0"
- "@csstools/postcss-logical-viewport-units": "npm:^3.0.1"
- "@csstools/postcss-media-minmax": "npm:^2.0.1"
- "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.1"
+ "@csstools/postcss-logical-viewport-units": "npm:^3.0.2"
+ "@csstools/postcss-media-minmax": "npm:^2.0.2"
+ "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.2"
"@csstools/postcss-nested-calc": "npm:^4.0.0"
"@csstools/postcss-normalize-display-values": "npm:^4.0.0"
- "@csstools/postcss-oklab-function": "npm:^4.0.2"
+ "@csstools/postcss-oklab-function": "npm:^4.0.3"
"@csstools/postcss-progressive-custom-properties": "npm:^4.0.0"
- "@csstools/postcss-relative-color-syntax": "npm:^3.0.2"
+ "@csstools/postcss-relative-color-syntax": "npm:^3.0.3"
"@csstools/postcss-scope-pseudo-class": "npm:^4.0.0"
- "@csstools/postcss-stepped-value-functions": "npm:^4.0.1"
+ "@csstools/postcss-stepped-value-functions": "npm:^4.0.2"
"@csstools/postcss-text-decoration-shorthand": "npm:^4.0.1"
- "@csstools/postcss-trigonometric-functions": "npm:^4.0.1"
+ "@csstools/postcss-trigonometric-functions": "npm:^4.0.2"
"@csstools/postcss-unset-value": "npm:^4.0.0"
autoprefixer: "npm:^10.4.19"
browserslist: "npm:^4.23.1"
@@ -5957,12 +5967,12 @@ __metadata:
cssdb: "npm:^8.1.1"
postcss-attribute-case-insensitive: "npm:^7.0.0"
postcss-clamp: "npm:^4.1.0"
- postcss-color-functional-notation: "npm:^7.0.2"
+ postcss-color-functional-notation: "npm:^7.0.3"
postcss-color-hex-alpha: "npm:^10.0.0"
postcss-color-rebeccapurple: "npm:^10.0.0"
- postcss-custom-media: "npm:^11.0.2"
- postcss-custom-properties: "npm:^14.0.1"
- postcss-custom-selectors: "npm:^8.0.1"
+ postcss-custom-media: "npm:^11.0.3"
+ postcss-custom-properties: "npm:^14.0.2"
+ postcss-custom-selectors: "npm:^8.0.2"
postcss-dir-pseudo-class: "npm:^9.0.0"
postcss-double-position-gradients: "npm:^6.0.0"
postcss-focus-visible: "npm:^10.0.0"
@@ -5970,7 +5980,7 @@ __metadata:
postcss-font-variant: "npm:^5.0.0"
postcss-gap-properties: "npm:^6.0.0"
postcss-image-set-function: "npm:^7.0.0"
- postcss-lab-function: "npm:^7.0.2"
+ postcss-lab-function: "npm:^7.0.3"
postcss-logical: "npm:^8.0.0"
postcss-nesting: "npm:^13.0.0"
postcss-opacity-percentage: "npm:^3.0.0"
@@ -5982,7 +5992,7 @@ __metadata:
postcss-selector-not: "npm:^8.0.0"
peerDependencies:
postcss: ^8.4
- checksum: 10c0/01660acf3b9ddf4d612a31819e9a5de9fe5383e9eddd2c130180f66ae90c5a881eb408e73454fd50e1839eae71678d738bf72073de08f9013c183b0bd9950fe5
+ checksum: 10c0/f789000e0504fd827e854bb0feb8b4c218d381314e4d863c5a36df925df412d0844c912952fe27892a320433640aeaff03ee94a3057b42011bf5d32b3963f333
languageName: node
linkType: hard
From 9e3a75a07701e875e871869452aa8afb4d160e11 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 13 Oct 2024 22:29:47 +0100
Subject: [PATCH 03/18] Update babel monorepo to v7.25.8 (#9863)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 4 +-
yarn.lock | 366 ++++++++++++---------------------------------------
2 files changed, 89 insertions(+), 281 deletions(-)
diff --git a/package.json b/package.json
index 227a2af99afc..0182b878c742 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,8 @@
},
"devDependencies": {
"@babel/cli": "7.25.7",
- "@babel/core": "7.25.7",
- "@babel/preset-env": "7.25.7",
+ "@babel/core": "7.25.8",
+ "@babel/preset-env": "7.25.8",
"@eslint/js": "9.12.0",
"babel-loader": "9.2.1",
"clean-webpack-plugin": "4.0.0",
diff --git a/yarn.lock b/yarn.lock
index c6411d260d5e..e0ae45a3a4a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -52,16 +52,16 @@ __metadata:
languageName: node
linkType: hard
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/compat-data@npm:7.25.7"
- checksum: 10c0/e5cc915abdd18d021236474a96606b2d4a915c4fb620c1ad776b8a08d91111e788cb3b7e9bad43593d4e0bfa4f06894357bcb0984102de1861b9e7322b6bc9f8
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.25.7, @babel/compat-data@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/compat-data@npm:7.25.8"
+ checksum: 10c0/8b81c17580e5fb4cbb6a3c52079f8c283fc59c0c6bd2fe14cfcf9c44b32d2eaab71b02c5633e2c679f5896f73f8ac4036ba2e67a4c806e8f428e4b11f526d7f4
languageName: node
linkType: hard
-"@babel/core@npm:7.25.7":
- version: 7.25.7
- resolution: "@babel/core@npm:7.25.7"
+"@babel/core@npm:7.25.8":
+ version: 7.25.8
+ resolution: "@babel/core@npm:7.25.8"
dependencies:
"@ampproject/remapping": "npm:^2.2.0"
"@babel/code-frame": "npm:^7.25.7"
@@ -69,16 +69,16 @@ __metadata:
"@babel/helper-compilation-targets": "npm:^7.25.7"
"@babel/helper-module-transforms": "npm:^7.25.7"
"@babel/helpers": "npm:^7.25.7"
- "@babel/parser": "npm:^7.25.7"
+ "@babel/parser": "npm:^7.25.8"
"@babel/template": "npm:^7.25.7"
"@babel/traverse": "npm:^7.25.7"
- "@babel/types": "npm:^7.25.7"
+ "@babel/types": "npm:^7.25.8"
convert-source-map: "npm:^2.0.0"
debug: "npm:^4.1.0"
gensync: "npm:^1.0.0-beta.2"
json5: "npm:^2.2.3"
semver: "npm:^6.3.1"
- checksum: 10c0/dad20af39624086afc3a0910bd97ae712c9ad0e9dda09fc5da93876e8ea1802b63ddd81c44f4aa8a9834db46de801eaab1ce9b81ab54b4fe907ae052c24de136
+ checksum: 10c0/8411ea506e6f7c8a39ab5c1524b00589fa3b087edb47389708f7fe07170929192171734666e3ea10b95a951643a531a6d09eedfe071572c9ea28516646265086
languageName: node
linkType: hard
@@ -214,7 +214,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.25.7, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.25.7":
version: 7.25.7
resolution: "@babel/helper-plugin-utils@npm:7.25.7"
checksum: 10c0/241f8cf3c5b7700e91cab7cfe5b432a3c710ae3cd5bb96dc554da536a6d25f5b9f000cc0c0917501ceb4f76ba92599ee3beb25e10adaf96be59f8df89a842faf
@@ -321,14 +321,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/parser@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/parser@npm:7.25.7"
+"@babel/parser@npm:^7.25.7, @babel/parser@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/parser@npm:7.25.8"
dependencies:
- "@babel/types": "npm:^7.25.7"
+ "@babel/types": "npm:^7.25.8"
bin:
parser: ./bin/babel-parser.js
- checksum: 10c0/b771469bb6b636c18a8d642b9df3c73913c3860a979591e1a29a98659efd38b81d3e393047b5251fe382d4c82c681c12da9ce91c98d69316d2604d155a214bcf
+ checksum: 10c0/a1a13845b7e8dda4c970791814a4bbf60004969882f18f470e260ad822d2e1f8941948f851e9335895563610f240fa6c98481ce8019865e469502bbf21daafa4
languageName: node
linkType: hard
@@ -400,61 +400,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-syntax-async-generators@npm:^7.8.4":
- version: 7.8.4
- resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.0"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/d13efb282838481348c71073b6be6245b35d4f2f964a8f71e4174f235009f929ef7613df25f8d2338e2d3e44bc4265a9f8638c6aaa136d7a61fe95985f9725c8
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-class-properties@npm:^7.12.13":
- version: 7.12.13
- resolution: "@babel/plugin-syntax-class-properties@npm:7.12.13"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.12.13"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/95168fa186416195280b1264fb18afcdcdcea780b3515537b766cb90de6ce042d42dd6a204a39002f794ae5845b02afb0fd4861a3308a861204a55e68310a120
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-class-static-block@npm:^7.14.5":
- version: 7.14.5
- resolution: "@babel/plugin-syntax-class-static-block@npm:7.14.5"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.14.5"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/4464bf9115f4a2d02ce1454411baf9cfb665af1da53709c5c56953e5e2913745b0fcce82982a00463d6facbdd93445c691024e310b91431a1e2f024b158f6371
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-dynamic-import@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-dynamic-import@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.0"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/9c50927bf71adf63f60c75370e2335879402648f468d0172bc912e303c6a3876927d8eb35807331b57f415392732ed05ab9b42c68ac30a936813ab549e0246c5
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-export-namespace-from@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-export-namespace-from@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.3"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/5100d658ba563829700cd8d001ddc09f4c0187b1a13de300d729c5b3e87503f75a6d6c99c1794182f7f1a9f546ee009df4f15a0ce36376e206ed0012fa7cdc24
- languageName: node
- linkType: hard
-
"@babel/plugin-syntax-import-assertions@npm:^7.25.7":
version: 7.25.7
resolution: "@babel/plugin-syntax-import-assertions@npm:7.25.7"
@@ -477,116 +422,6 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-syntax-import-meta@npm:^7.10.4":
- version: 7.10.4
- resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.10.4"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/0b08b5e4c3128523d8e346f8cfc86824f0da2697b1be12d71af50a31aff7a56ceb873ed28779121051475010c28d6146a6bfea8518b150b71eeb4e46190172ee
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-json-strings@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-json-strings@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.0"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/e98f31b2ec406c57757d115aac81d0336e8434101c224edd9a5c93cefa53faf63eacc69f3138960c8b25401315af03df37f68d316c151c4b933136716ed6906e
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4":
- version: 7.10.4
- resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.10.4"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/2594cfbe29411ad5bc2ad4058de7b2f6a8c5b86eda525a993959438615479e59c012c14aec979e538d60a584a1a799b60d1b8942c3b18468cb9d99b8fd34cd0b
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-nullish-coalescing-operator@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-nullish-coalescing-operator@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.0"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/2024fbb1162899094cfc81152449b12bd0cc7053c6d4bda8ac2852545c87d0a851b1b72ed9560673cbf3ef6248257262c3c04aabf73117215c1b9cc7dd2542ce
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-numeric-separator@npm:^7.10.4":
- version: 7.10.4
- resolution: "@babel/plugin-syntax-numeric-separator@npm:7.10.4"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.10.4"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/c55a82b3113480942c6aa2fcbe976ff9caa74b7b1109ff4369641dfbc88d1da348aceb3c31b6ed311c84d1e7c479440b961906c735d0ab494f688bf2fd5b9bb9
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-object-rest-spread@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-object-rest-spread@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.0"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/ee1eab52ea6437e3101a0a7018b0da698545230015fc8ab129d292980ec6dff94d265e9e90070e8ae5fed42f08f1622c14c94552c77bcac784b37f503a82ff26
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-optional-catch-binding@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-optional-catch-binding@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.0"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/27e2493ab67a8ea6d693af1287f7e9acec206d1213ff107a928e85e173741e1d594196f99fec50e9dde404b09164f39dec5864c767212154ffe1caa6af0bc5af
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-optional-chaining@npm:^7.8.3":
- version: 7.8.3
- resolution: "@babel/plugin-syntax-optional-chaining@npm:7.8.3"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.8.0"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/46edddf2faa6ebf94147b8e8540dfc60a5ab718e2de4d01b2c0bdf250a4d642c2bd47cbcbb739febcb2bf75514dbcefad3c52208787994b8d0f8822490f55e81
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-private-property-in-object@npm:^7.14.5":
- version: 7.14.5
- resolution: "@babel/plugin-syntax-private-property-in-object@npm:7.14.5"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.14.5"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/69822772561706c87f0a65bc92d0772cea74d6bc0911537904a676d5ff496a6d3ac4e05a166d8125fce4a16605bace141afc3611074e170a994e66e5397787f3
- languageName: node
- linkType: hard
-
-"@babel/plugin-syntax-top-level-await@npm:^7.14.5":
- version: 7.14.5
- resolution: "@babel/plugin-syntax-top-level-await@npm:7.14.5"
- dependencies:
- "@babel/helper-plugin-utils": "npm:^7.14.5"
- peerDependencies:
- "@babel/core": ^7.0.0-0
- checksum: 10c0/14bf6e65d5bc1231ffa9def5f0ef30b19b51c218fcecaa78cd1bdf7939dfdf23f90336080b7f5196916368e399934ce5d581492d8292b46a2fb569d8b2da106f
- languageName: node
- linkType: hard
-
"@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
version: 7.18.6
resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
@@ -610,17 +445,16 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-async-generator-functions@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.7"
+"@babel/plugin-transform-async-generator-functions@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
"@babel/helper-remap-async-to-generator": "npm:^7.25.7"
- "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
"@babel/traverse": "npm:^7.25.7"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/dcdd17d8cafafe0eb2edd0a46a7abe86c72235c957c8eb1157ccadb2b199572d5d1aa36a2d3bce5cb99990f7d3c6290ecf09959c62f3081c4df9ff717a1c84a4
+ checksum: 10c0/1698d0757d3dc895047120346cdbe6d539dae4a7bb930caf958c3623e89c850d378d1ebd971a1a8b4cba39c8f001cd9c25a1d6f430099022ab1e87aeddb5dd88
languageName: node
linkType: hard
@@ -671,16 +505,15 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-class-static-block@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-class-static-block@npm:7.25.7"
+"@babel/plugin-transform-class-static-block@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-class-static-block@npm:7.25.8"
dependencies:
"@babel/helper-create-class-features-plugin": "npm:^7.25.7"
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
peerDependencies:
"@babel/core": ^7.12.0
- checksum: 10c0/cbb4b46cbd8ad10106eb2bedb5a0665661a1d1d5b6f3ab565ff454b802dab4718e02b25670fe0d40835494aedb3dc26757c06cc4da6ff3e80291c5f882269bd3
+ checksum: 10c0/4f37853aef6920875022bbb2d7c6523218d9d718291464e2cacd9cc6f2c22d86a69948d8ea38f9248843bbfe9343f3fd18cf16b1615560124198bf999e3ba612
languageName: node
linkType: hard
@@ -758,15 +591,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-dynamic-import@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-dynamic-import@npm:7.25.7"
+"@babel/plugin-transform-dynamic-import@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-dynamic-import@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/c733252ff20a32d9747dd081916270f5a073856597e849a5f458b12f4354499b18714f5e7049e341432851d9975077cb37effcd276c7f816faa6f5ff708dc5e1
+ checksum: 10c0/9726abc1b07771a9c1e3670908ac425d21e29f54c775d10ed7a4e2bc0a18e07600f70bbc531deba3fb3ff7f6763c189200593264c6f784dac583e653b66fe754
languageName: node
linkType: hard
@@ -782,15 +614,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-export-namespace-from@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-export-namespace-from@npm:7.25.7"
+"@babel/plugin-transform-export-namespace-from@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-export-namespace-from@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/ef61fc5d54c9c8b075cbd9db62beaf295e38e08a1edb1882995105d3e959763be1631f7d7f7cb7461b702ebd0b4a601f2eb2cd6521acaf061310a3a3305fa756
+ checksum: 10c0/8a2e1205dd727a96a9adef0e981d68c61b1c286480b9136e2aa67ce3e2c742be4f87feb9fb4c5548a401aba0953d43d66e9ec36a54dea6a7c15f1ee9345baf57
languageName: node
linkType: hard
@@ -819,15 +650,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-json-strings@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-json-strings@npm:7.25.7"
+"@babel/plugin-transform-json-strings@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-json-strings@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/aa6e5f65c8a5f2459d7daa9b5b4ff97ff43bab21f4a8513ed84d35300b0323ec542dc101c5f11622e442dfc93b3a229c7f41ebc7645370dfec6d066bda800a0b
+ checksum: 10c0/2a6cf69ebe8deebc39c56adae75d609e16786dc4cbd83577eefdc838bd89ca8974671d47e2669b8e65ef9b7ace427f7c2c5a9fc6aa09247b10e141d15fee81cf
languageName: node
linkType: hard
@@ -842,15 +672,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.25.7"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/d610a8a2c1be83e03cce2256f29519e705dc68289c09d67f1f362d1fd80f4b36eaf2affc05710abb53a272895041e24d9e95ec73a516a23a67cb907023fbe37b
+ checksum: 10c0/9adc2634c94b283b682fbf71bbec553bd8448196213491a0ef9ea167993c9c36dcb2fbefbd834e113cfed843a67290131bc99e463f8702043c3f4e3a99bb807e
languageName: node
linkType: hard
@@ -939,41 +768,38 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.25.7"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/b35a96a79ef4895b00e4f758d3185cb17e4fbfada311894ad5f0988a55fc2c21820dc789b26a3cb8fbd620434faa516e52acb6e2da105c2edbd29de8b6b0facf
+ checksum: 10c0/3cb7c44cffccae42e104755acb31b4f00bc27d8c88102ae6f30dca508832f98fa5b746bead0fc7c0c6ddcf83f336829be4b64245c6c7ce26b3ef591937ec54a4
languageName: node
linkType: hard
-"@babel/plugin-transform-numeric-separator@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-numeric-separator@npm:7.25.7"
+"@babel/plugin-transform-numeric-separator@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-numeric-separator@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/c028ae89e6b4e1d757f8f1ebcb3b420e6559bb35002728f6f5651d5f669fbf73764adf6e3597908fa12adf8dbae683e5f74b3a7f68e8774a9663c18c0f999539
+ checksum: 10c0/d23b3ebc50513f24510791ac2cad43e3c6ea08579f54dccfd4ed5e5d5084f02da0576ea42ea999fb51e1f94f42857cac96a1a29ac6728fc262fbe87ec966dc18
languageName: node
linkType: hard
-"@babel/plugin-transform-object-rest-spread@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-object-rest-spread@npm:7.25.7"
+"@babel/plugin-transform-object-rest-spread@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-object-rest-spread@npm:7.25.8"
dependencies:
"@babel/helper-compilation-targets": "npm:^7.25.7"
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
"@babel/plugin-transform-parameters": "npm:^7.25.7"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/e8b978d9d1020452da0d5d92f80fe57e302761dac20137bb8bf863478a4779fcd63d314db89e796125d9d76da2a38f64f012d6e0c4913815951b3eb3fba2feb6
+ checksum: 10c0/058d5f5bb61068997fb78855011dd175d441da84717640852bbfd12a5919acf8d8c5a14c1debfe87d230f3f4c47c22fcad3d7fa1acd72e5e48b2fff93b6c1dd9
languageName: node
linkType: hard
@@ -989,28 +815,26 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-optional-catch-binding@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.25.7"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/bb609e5103780be0825a255ffe1fefbb5335aead88a46eecc2257053279ea2c45ff66b0ef1fb54302c8c8c57146e88e52f3ecb62b4c6f619218d7b3843b352d9
+ checksum: 10c0/f4360e62ca4aa998db31548d0ef06836d958bcb29dee58f5c62d0c29b6b2bff1b54871195bd032825fe3dd79a4fd8275e165148c8d4b57694bcf72135c8f7d24
languageName: node
linkType: hard
-"@babel/plugin-transform-optional-chaining@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-optional-chaining@npm:7.25.7"
+"@babel/plugin-transform-optional-chaining@npm:^7.25.7, @babel/plugin-transform-optional-chaining@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-optional-chaining@npm:7.25.8"
dependencies:
"@babel/helper-plugin-utils": "npm:^7.25.7"
"@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.7"
- "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/887441ada6c2bc1b789984b7531d9bc585f335ece99642886d3d9fd8aee7e6b8d4f7ca61d76b5f23477f3aa607284d5056eadaa1eb17e7b39af6b0e834cbe878
+ checksum: 10c0/a1cdbfc249619fa6b37e57f81600701281629d86a57e616b0c2b29816d0c43114a2296ce089564afd3aa7870c8aad62e907658ffef2c110662af14ee23d5247f
languageName: node
linkType: hard
@@ -1037,17 +861,16 @@ __metadata:
languageName: node
linkType: hard
-"@babel/plugin-transform-private-property-in-object@npm:^7.25.7":
- version: 7.25.7
- resolution: "@babel/plugin-transform-private-property-in-object@npm:7.25.7"
+"@babel/plugin-transform-private-property-in-object@npm:^7.25.8":
+ version: 7.25.8
+ resolution: "@babel/plugin-transform-private-property-in-object@npm:7.25.8"
dependencies:
"@babel/helper-annotate-as-pure": "npm:^7.25.7"
"@babel/helper-create-class-features-plugin": "npm:^7.25.7"
"@babel/helper-plugin-utils": "npm:^7.25.7"
- "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/5ad8832ba54e2079c1f558b8680e170265e3f376424e5fbb75b17b7f08696fb0af6c96d23d92f7df3dcc559f5971a02587281fcec38a853174aa95478565f5fc
+ checksum: 10c0/61b5e3a4eb94caf38d6e9ff7bff1ac8927758141aaa4891036d3490866ecee53beaefd7893519fec42a4c55f33374a17fc0e49694cdaf95668082073f0fe4a79
languageName: node
linkType: hard
@@ -1188,11 +1011,11 @@ __metadata:
languageName: node
linkType: hard
-"@babel/preset-env@npm:7.25.7":
- version: 7.25.7
- resolution: "@babel/preset-env@npm:7.25.7"
+"@babel/preset-env@npm:7.25.8":
+ version: 7.25.8
+ resolution: "@babel/preset-env@npm:7.25.8"
dependencies:
- "@babel/compat-data": "npm:^7.25.7"
+ "@babel/compat-data": "npm:^7.25.8"
"@babel/helper-compilation-targets": "npm:^7.25.7"
"@babel/helper-plugin-utils": "npm:^7.25.7"
"@babel/helper-validator-option": "npm:^7.25.7"
@@ -1202,45 +1025,30 @@ __metadata:
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.25.7"
"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.25.7"
"@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
- "@babel/plugin-syntax-async-generators": "npm:^7.8.4"
- "@babel/plugin-syntax-class-properties": "npm:^7.12.13"
- "@babel/plugin-syntax-class-static-block": "npm:^7.14.5"
- "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3"
- "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3"
"@babel/plugin-syntax-import-assertions": "npm:^7.25.7"
"@babel/plugin-syntax-import-attributes": "npm:^7.25.7"
- "@babel/plugin-syntax-import-meta": "npm:^7.10.4"
- "@babel/plugin-syntax-json-strings": "npm:^7.8.3"
- "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4"
- "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3"
- "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4"
- "@babel/plugin-syntax-object-rest-spread": "npm:^7.8.3"
- "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3"
- "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3"
- "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5"
- "@babel/plugin-syntax-top-level-await": "npm:^7.14.5"
"@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
"@babel/plugin-transform-arrow-functions": "npm:^7.25.7"
- "@babel/plugin-transform-async-generator-functions": "npm:^7.25.7"
+ "@babel/plugin-transform-async-generator-functions": "npm:^7.25.8"
"@babel/plugin-transform-async-to-generator": "npm:^7.25.7"
"@babel/plugin-transform-block-scoped-functions": "npm:^7.25.7"
"@babel/plugin-transform-block-scoping": "npm:^7.25.7"
"@babel/plugin-transform-class-properties": "npm:^7.25.7"
- "@babel/plugin-transform-class-static-block": "npm:^7.25.7"
+ "@babel/plugin-transform-class-static-block": "npm:^7.25.8"
"@babel/plugin-transform-classes": "npm:^7.25.7"
"@babel/plugin-transform-computed-properties": "npm:^7.25.7"
"@babel/plugin-transform-destructuring": "npm:^7.25.7"
"@babel/plugin-transform-dotall-regex": "npm:^7.25.7"
"@babel/plugin-transform-duplicate-keys": "npm:^7.25.7"
"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.7"
- "@babel/plugin-transform-dynamic-import": "npm:^7.25.7"
+ "@babel/plugin-transform-dynamic-import": "npm:^7.25.8"
"@babel/plugin-transform-exponentiation-operator": "npm:^7.25.7"
- "@babel/plugin-transform-export-namespace-from": "npm:^7.25.7"
+ "@babel/plugin-transform-export-namespace-from": "npm:^7.25.8"
"@babel/plugin-transform-for-of": "npm:^7.25.7"
"@babel/plugin-transform-function-name": "npm:^7.25.7"
- "@babel/plugin-transform-json-strings": "npm:^7.25.7"
+ "@babel/plugin-transform-json-strings": "npm:^7.25.8"
"@babel/plugin-transform-literals": "npm:^7.25.7"
- "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.7"
+ "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.8"
"@babel/plugin-transform-member-expression-literals": "npm:^7.25.7"
"@babel/plugin-transform-modules-amd": "npm:^7.25.7"
"@babel/plugin-transform-modules-commonjs": "npm:^7.25.7"
@@ -1248,15 +1056,15 @@ __metadata:
"@babel/plugin-transform-modules-umd": "npm:^7.25.7"
"@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.25.7"
"@babel/plugin-transform-new-target": "npm:^7.25.7"
- "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.25.7"
- "@babel/plugin-transform-numeric-separator": "npm:^7.25.7"
- "@babel/plugin-transform-object-rest-spread": "npm:^7.25.7"
+ "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.25.8"
+ "@babel/plugin-transform-numeric-separator": "npm:^7.25.8"
+ "@babel/plugin-transform-object-rest-spread": "npm:^7.25.8"
"@babel/plugin-transform-object-super": "npm:^7.25.7"
- "@babel/plugin-transform-optional-catch-binding": "npm:^7.25.7"
- "@babel/plugin-transform-optional-chaining": "npm:^7.25.7"
+ "@babel/plugin-transform-optional-catch-binding": "npm:^7.25.8"
+ "@babel/plugin-transform-optional-chaining": "npm:^7.25.8"
"@babel/plugin-transform-parameters": "npm:^7.25.7"
"@babel/plugin-transform-private-methods": "npm:^7.25.7"
- "@babel/plugin-transform-private-property-in-object": "npm:^7.25.7"
+ "@babel/plugin-transform-private-property-in-object": "npm:^7.25.8"
"@babel/plugin-transform-property-literals": "npm:^7.25.7"
"@babel/plugin-transform-regenerator": "npm:^7.25.7"
"@babel/plugin-transform-reserved-words": "npm:^7.25.7"
@@ -1277,7 +1085,7 @@ __metadata:
semver: "npm:^6.3.1"
peerDependencies:
"@babel/core": ^7.0.0-0
- checksum: 10c0/bf704a06a69420250c1de2b126cd5c859a851002c2fb2cce0910cd85a8e6755b9b31577021e94feb7e1e53519923726349aaf07580923928791583db61438fb8
+ checksum: 10c0/a45cd64ca082262998f6cf508b413ff8a9e967bf33e58337a1fe41c6c939a4c25cc73cd58387792c00d43905cf5fb0ea5ef88dfdc2addf2e8133743088c86c72
languageName: node
linkType: hard
@@ -1329,14 +1137,14 @@ __metadata:
languageName: node
linkType: hard
-"@babel/types@npm:^7.25.7, @babel/types@npm:^7.4.4":
- version: 7.25.7
- resolution: "@babel/types@npm:7.25.7"
+"@babel/types@npm:^7.25.7, @babel/types@npm:^7.25.8, @babel/types@npm:^7.4.4":
+ version: 7.25.8
+ resolution: "@babel/types@npm:7.25.8"
dependencies:
"@babel/helper-string-parser": "npm:^7.25.7"
"@babel/helper-validator-identifier": "npm:^7.25.7"
to-fast-properties: "npm:^2.0.0"
- checksum: 10c0/e03e1e2e08600fa1e8eb90632ac9c253dd748176c8d670d85f85b0dc83a0573b26ae748a1cbcb81f401903a3d95f43c3f4f8d516a5ed779929db27de56289633
+ checksum: 10c0/55ca2d6df6426c98db2769ce884ce5e9de83a512ea2dd7bcf56c811984dc14351cacf42932a723630c5afcff2455809323decd645820762182f10b7b5252b59f
languageName: node
linkType: hard
@@ -4418,8 +4226,8 @@ __metadata:
resolution: "jenkins-ui@workspace:."
dependencies:
"@babel/cli": "npm:7.25.7"
- "@babel/core": "npm:7.25.7"
- "@babel/preset-env": "npm:7.25.7"
+ "@babel/core": "npm:7.25.8"
+ "@babel/preset-env": "npm:7.25.8"
"@eslint/js": "npm:9.12.0"
babel-loader: "npm:9.2.1"
clean-webpack-plugin: "npm:4.0.0"
From c34234f2c5a28f3965f03afce6a0df9298d7da4e Mon Sep 17 00:00:00 2001
From: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Date: Mon, 14 Oct 2024 09:09:20 +0100
Subject: [PATCH 04/18] Refine content and appearance of the 'Edit View' screen
(#9833)
Co-authored-by: Tim Jacomb
---
.../ListView/configure-entries-resources.js | 5 +-
.../model/ListView/configure-entries.jelly | 72 ++++++++++---------
.../ListView/configure-entries.properties | 3 +
.../hudson/model/View/configure.jelly | 39 ++++++----
.../hudson/model/View/configure.properties | 4 ++
.../main/resources/lib/form/checkbox.jelly | 8 +++
src/main/scss/base/_style.scss | 8 ---
src/main/scss/pages/_dashboard.scss | 14 ++++
.../webapp/help/view-config/description.html | 6 --
.../help/view-config/description_bg.html | 7 --
.../help/view-config/description_de.html | 7 --
.../help/view-config/description_fr.html | 6 --
.../help/view-config/description_it.html | 7 --
.../help/view-config/description_ja.html | 6 --
.../help/view-config/description_nl.html | 8 ---
.../help/view-config/description_pt_BR.html | 6 --
.../help/view-config/description_ru.html | 6 --
.../help/view-config/description_tr.html | 7 --
.../help/view-config/description_zh_TW.html | 5 --
.../help/view-config/filter-executors.html | 27 -------
.../help/view-config/filter-executors_bg.html | 4 --
.../help/view-config/filter-executors_de.html | 27 -------
.../help/view-config/filter-executors_it.html | 27 -------
.../help/view-config/filter-executors_ja.html | 24 -------
.../view-config/filter-executors_pt_BR.html | 27 -------
.../view-config/filter-executors_zh_TW.html | 1 -
.../webapp/help/view-config/filter-queue.html | 24 -------
.../help/view-config/filter-queue_bg.html | 4 --
.../help/view-config/filter-queue_de.html | 27 -------
.../help/view-config/filter-queue_it.html | 27 -------
.../help/view-config/filter-queue_ja.html | 24 -------
.../help/view-config/filter-queue_pt_BR.html | 24 -------
.../help/view-config/filter-queue_zh_TW.html | 1 -
33 files changed, 95 insertions(+), 397 deletions(-)
create mode 100644 core/src/main/resources/hudson/model/ListView/configure-entries.properties
create mode 100644 core/src/main/resources/hudson/model/View/configure.properties
delete mode 100644 war/src/main/webapp/help/view-config/description.html
delete mode 100644 war/src/main/webapp/help/view-config/description_bg.html
delete mode 100644 war/src/main/webapp/help/view-config/description_de.html
delete mode 100644 war/src/main/webapp/help/view-config/description_fr.html
delete mode 100644 war/src/main/webapp/help/view-config/description_it.html
delete mode 100644 war/src/main/webapp/help/view-config/description_ja.html
delete mode 100644 war/src/main/webapp/help/view-config/description_nl.html
delete mode 100644 war/src/main/webapp/help/view-config/description_pt_BR.html
delete mode 100644 war/src/main/webapp/help/view-config/description_ru.html
delete mode 100644 war/src/main/webapp/help/view-config/description_tr.html
delete mode 100644 war/src/main/webapp/help/view-config/description_zh_TW.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-executors.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-executors_bg.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-executors_de.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-executors_it.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-executors_ja.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-executors_pt_BR.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-executors_zh_TW.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-queue.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-queue_bg.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-queue_de.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-queue_it.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-queue_ja.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-queue_pt_BR.html
delete mode 100644 war/src/main/webapp/help/view-config/filter-queue_zh_TW.html
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js b/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
index 86ccbb6447a7..f9db2d067478 100644
--- a/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries-resources.js
@@ -1,5 +1,8 @@
Behaviour.specify("#recurse", "ListView", 0, function (e) {
- var nestedElements = document.querySelectorAll("SPAN.nested");
+ // SPAN.nested is kept for backwards compatability
+ var nestedElements = document.querySelectorAll(
+ ".listview-jobs--nested, SPAN.nested",
+ );
e.onclick = function () {
nestedElements.forEach(function (el) {
el.style.display = e.checked ? "" : "none";
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
index 5cffab5e11ee..350235870b01 100644
--- a/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries.jelly
@@ -27,49 +27,51 @@ THE SOFTWARE.
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
-
+
+
+
-
-
-
-
-
-
-
diff --git a/core/src/main/resources/hudson/model/ListView/configure-entries.properties b/core/src/main/resources/hudson/model/ListView/configure-entries.properties
new file mode 100644
index 000000000000..fb58880346b9
--- /dev/null
+++ b/core/src/main/resources/hudson/model/ListView/configure-entries.properties
@@ -0,0 +1,3 @@
+jobs.description=Select the jobs to show in this view.
+filters.description=Filter the jobs that show in this view based on specific conditions.
+columns.description=Select the columns in this view.
diff --git a/core/src/main/resources/hudson/model/View/configure.jelly b/core/src/main/resources/hudson/model/View/configure.jelly
index beceff8230ab..6f2ff2744fe1 100644
--- a/core/src/main/resources/hudson/model/View/configure.jelly
+++ b/core/src/main/resources/hudson/model/View/configure.jelly
@@ -29,25 +29,25 @@ THE SOFTWARE.
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -55,6 +55,17 @@ THE SOFTWARE.
+
+
+
+
+
+
+
+
+
diff --git a/core/src/main/resources/hudson/model/View/configure.properties b/core/src/main/resources/hudson/model/View/configure.properties
new file mode 100644
index 000000000000..f5883d65a59e
--- /dev/null
+++ b/core/src/main/resources/hudson/model/View/configure.properties
@@ -0,0 +1,4 @@
+description.description=Describe the purpose of this view.
+widgets.description=Customize the widgets that show in this view.
+widgets.filterqueue.description=If checked, only jobs in this view will be shown in the queue.
+widgets.filterexecutors.description=If checked, only those build executors will be shown that could execute the jobs in this view.
diff --git a/core/src/main/resources/lib/form/checkbox.jelly b/core/src/main/resources/lib/form/checkbox.jelly
index 60c8c11f4c52..de831954cafc 100644
--- a/core/src/main/resources/lib/form/checkbox.jelly
+++ b/core/src/main/resources/lib/form/checkbox.jelly
@@ -69,6 +69,9 @@ THE SOFTWARE.
Used as tooltip of the checkbox, and, if a title is specified, of the title
+
+ Optional description for the checkbox
+
@@ -87,6 +90,11 @@ THE SOFTWARE.
${attrs.title}
+
+
+ ${attrs.description}
+
+
${customizedFields.add(name)}
diff --git a/src/main/scss/base/_style.scss b/src/main/scss/base/_style.scss
index e586248d18a8..273d583d4ca9 100644
--- a/src/main/scss/base/_style.scss
+++ b/src/main/scss/base/_style.scss
@@ -406,14 +406,6 @@ img.icon-help {
vertical-align: text-top;
}
-/* ============================ list view entries ======================== */
-div.listview-jobs {
- max-height: 300px;
- overflow: auto;
- margin-left: -15px;
- padding-left: 15px;
-}
-
/* ============================ health report hover ========================== */
.healthReport a {
diff --git a/src/main/scss/pages/_dashboard.scss b/src/main/scss/pages/_dashboard.scss
index 3ace60fac309..4d6f49017566 100644
--- a/src/main/scss/pages/_dashboard.scss
+++ b/src/main/scss/pages/_dashboard.scss
@@ -180,3 +180,17 @@ $min-button-size: 36px;
height: 1rem;
}
}
+
+div.listview-jobs {
+ display: flex;
+ flex-direction: column;
+ gap: 0.3rem;
+
+ &--nested {
+ display: flex;
+ flex-direction: column;
+ border-left: 2px solid color-mix(in sRGB, var(--input-border), transparent);
+ margin-left: 10px;
+ padding-left: 22px;
+ }
+}
diff --git a/war/src/main/webapp/help/view-config/description.html b/war/src/main/webapp/help/view-config/description.html
deleted file mode 100644
index 116a5d17ed7c..000000000000
--- a/war/src/main/webapp/help/view-config/description.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- This message will be displayed on
-
the view page
- . Useful for describing what this view does or linking to relevant resources.
- Can contain HTML tags or whatever markup language is defined for the system.
-
diff --git a/war/src/main/webapp/help/view-config/description_bg.html b/war/src/main/webapp/help/view-config/description_bg.html
deleted file mode 100644
index 2f9a0c920697..000000000000
--- a/war/src/main/webapp/help/view-config/description_bg.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Това съобщение ще се показва на
-
страницата за изгледа
- . Това е удобно да обясните за какво служи изгледа или да дадете подходящи
- връзки към полезни ресурси. Може да съдържа форматиране чрез етикети на HTML
- или произволен маркиращ език, който се поддържа от Jenkins.
-
diff --git a/war/src/main/webapp/help/view-config/description_de.html b/war/src/main/webapp/help/view-config/description_de.html
deleted file mode 100644
index 63eecbf510c6..000000000000
--- a/war/src/main/webapp/help/view-config/description_de.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Diese Beschreibung wird auf der
-
Ansichtsseite
- angezeigt. Sie beschreibt, um was es in der Ansicht geht oder enthält Links zu
- weiteren relevanten Ressourcen. Die Beschreibung darf HTML-Auszeichnungen
- enthalten.
-
diff --git a/war/src/main/webapp/help/view-config/description_fr.html b/war/src/main/webapp/help/view-config/description_fr.html
deleted file mode 100644
index e2276e50a88c..000000000000
--- a/war/src/main/webapp/help/view-config/description_fr.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Ce message s'affichera sur la
-
page de visualisation
- . Utile pour décrire l'objectif de cette vue ou pour donner des liens vers des
- ressources supplémentaires. Supporte les tags HTML.
-
diff --git a/war/src/main/webapp/help/view-config/description_it.html b/war/src/main/webapp/help/view-config/description_it.html
deleted file mode 100644
index 562324afca80..000000000000
--- a/war/src/main/webapp/help/view-config/description_it.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Questo messaggio sarà visualizzato sulla
-
pagina della vista
- . Quest'opzione è utile per descrivere lo scopo di questa vista o per inserire
- collegamenti a risorse rilevanti. Può contenere marcatori HTML o del
- linguaggio a marcatori definito per il sistema.
-
diff --git a/war/src/main/webapp/help/view-config/description_ja.html b/war/src/main/webapp/help/view-config/description_ja.html
deleted file mode 100644
index f45f11ad4084..000000000000
--- a/war/src/main/webapp/help/view-config/description_ja.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- この説明は、
-
ビュー
- に表示されます。
- このビューについて説明したり、関連するリソースにリンクするのに便利です。HTMLタグを使用できます。
-
diff --git a/war/src/main/webapp/help/view-config/description_nl.html b/war/src/main/webapp/help/view-config/description_nl.html
deleted file mode 100644
index ebb5e3686899..000000000000
--- a/war/src/main/webapp/help/view-config/description_nl.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- Deze boodschap zal getoond worden op
-
uw specifieke overzichtspagina
- . Het kan nuttig zijn om te omschrijven wat uw overzichtspagina specifiek
- omvat. De boodschap mag HTML bevatten. U kunt dus ook, op eenvoudige wijze,
- referenties toevoegen naar relevante artefacten, zoals webpaginas, documenten,
- e-mail adressen, ...
-
diff --git a/war/src/main/webapp/help/view-config/description_pt_BR.html b/war/src/main/webapp/help/view-config/description_pt_BR.html
deleted file mode 100644
index df7732115bb6..000000000000
--- a/war/src/main/webapp/help/view-config/description_pt_BR.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Esta mensagem será mostrada na
-
página de visualização
- . Útil para descrever sobre o que é esta visualização, ou
- ligá-la a recursos relevantes. Pode conter marcações HTML.
-
diff --git a/war/src/main/webapp/help/view-config/description_ru.html b/war/src/main/webapp/help/view-config/description_ru.html
deleted file mode 100644
index 7303f0d6adf3..000000000000
--- a/war/src/main/webapp/help/view-config/description_ru.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
- Это сообщение будет показываться на
-
странице Пользовательского списка
- . Удобно для описания Пользовательского списка или ссылок на имеющие отношение
- ресурсы. Может содержать HTML.
-
diff --git a/war/src/main/webapp/help/view-config/description_tr.html b/war/src/main/webapp/help/view-config/description_tr.html
deleted file mode 100644
index 08c2a592ada8..000000000000
--- a/war/src/main/webapp/help/view-config/description_tr.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
- Bu mesaj,
-
görüntü ana sayfasında
- gösterilecektir. Bu görüntünün ne ile ilgili
- olduğunu anlatmak, veya ilgili kaynaklara bağlantılar
- yapabilmek için kullanılabilir. HTML tag'leri kullanabilirsiniz.
-
diff --git a/war/src/main/webapp/help/view-config/description_zh_TW.html b/war/src/main/webapp/help/view-config/description_zh_TW.html
deleted file mode 100644
index 2f38a3d86281..000000000000
--- a/war/src/main/webapp/help/view-config/description_zh_TW.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- 訊息會顯示在
-
視景頁
- 。 能用來說明這個視景的用途,或是提供相關資源的連結。 可以使用 HTML 標籤。
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors.html b/war/src/main/webapp/help/view-config/filter-executors.html
deleted file mode 100644
index 034420bb5917..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- If checked, only those build executors will be shown that could execute the
- jobs in this view.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_bg.html b/war/src/main/webapp/help/view-config/filter-executors_bg.html
deleted file mode 100644
index 6b36c6989ca7..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_bg.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- Когато е избрано, ще се показват само компютрите, които могат да изпълняват
- задачите в този изглед.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_de.html b/war/src/main/webapp/help/view-config/filter-executors_de.html
deleted file mode 100644
index 52e6465c770c..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_de.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Wenn angewählt, werden nur diejenigen Build-Prozessoren angezeigt, welche Jobs
- in dieser Ansicht ausführen könnten.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_it.html b/war/src/main/webapp/help/view-config/filter-executors_it.html
deleted file mode 100644
index 44fb82b5bea2..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_it.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Se quest'opzione è selezionata, solo gli esecutori in grado di eseguire i
- processi qui elencati saranno visualizzati in questa vista.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_ja.html b/war/src/main/webapp/help/view-config/filter-executors_ja.html
deleted file mode 100644
index efe9214b79d3..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_ja.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-このビューのジョブを実行可能なエグゼキューターのみ表示します。
diff --git a/war/src/main/webapp/help/view-config/filter-executors_pt_BR.html b/war/src/main/webapp/help/view-config/filter-executors_pt_BR.html
deleted file mode 100644
index 053df68e3154..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_pt_BR.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Caso selecionado, apenas executores de build que podem executar jobs nessa
- view aparecerão.
-
diff --git a/war/src/main/webapp/help/view-config/filter-executors_zh_TW.html b/war/src/main/webapp/help/view-config/filter-executors_zh_TW.html
deleted file mode 100644
index ff504373040c..000000000000
--- a/war/src/main/webapp/help/view-config/filter-executors_zh_TW.html
+++ /dev/null
@@ -1 +0,0 @@
-啟用後,就只會顯示能建置視景中作業的那些執行程式。
diff --git a/war/src/main/webapp/help/view-config/filter-queue.html b/war/src/main/webapp/help/view-config/filter-queue.html
deleted file mode 100644
index e658f998232a..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-If checked, only jobs in this view will be shown in the queue.
diff --git a/war/src/main/webapp/help/view-config/filter-queue_bg.html b/war/src/main/webapp/help/view-config/filter-queue_bg.html
deleted file mode 100644
index 7b22a78abde0..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_bg.html
+++ /dev/null
@@ -1,4 +0,0 @@
-
- Когато е избрано, ще се показват само тези задачи в опашката, които са също и
- в изгледа.
-
diff --git a/war/src/main/webapp/help/view-config/filter-queue_de.html b/war/src/main/webapp/help/view-config/filter-queue_de.html
deleted file mode 100644
index 2c2ec446239c..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_de.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Wenn angewählt, werden in der Build-Warteschlange nur Jobs dieser Ansicht
- angezeigt.
-
diff --git a/war/src/main/webapp/help/view-config/filter-queue_it.html b/war/src/main/webapp/help/view-config/filter-queue_it.html
deleted file mode 100644
index e7258892a005..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_it.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- Se quest'opzione è selezionata solo i processi che compaiono in questa vista
- saranno visualizzati nella coda.
-
diff --git a/war/src/main/webapp/help/view-config/filter-queue_ja.html b/war/src/main/webapp/help/view-config/filter-queue_ja.html
deleted file mode 100644
index 26da33be36a1..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_ja.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-このビューのジョブのみキューに表示されます。
diff --git a/war/src/main/webapp/help/view-config/filter-queue_pt_BR.html b/war/src/main/webapp/help/view-config/filter-queue_pt_BR.html
deleted file mode 100644
index f92dd00bb380..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_pt_BR.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Caso selecionado, apenas jobs nessa view aparecerão na fila.
diff --git a/war/src/main/webapp/help/view-config/filter-queue_zh_TW.html b/war/src/main/webapp/help/view-config/filter-queue_zh_TW.html
deleted file mode 100644
index 717957f1529e..000000000000
--- a/war/src/main/webapp/help/view-config/filter-queue_zh_TW.html
+++ /dev/null
@@ -1 +0,0 @@
-選用後,佇列中只會顯示視景裡的作業。
From f8ef23acd99c85b253266b47fe0376eb7faa2745 Mon Sep 17 00:00:00 2001
From: Debayan Ghosh <66942246+debayangg@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:42:12 +0530
Subject: [PATCH 05/18] [JENKINS-72979] Remove trailing space from Windows
agent secret file instructions (#9739)
---
.../resources/hudson/slaves/JNLPLauncher/main.jelly | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
index 2f211d16feae..ad9184473224 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
@@ -53,26 +53,26 @@ ${copy_java_cmd_secret_unix}
${copy_agent_jar_windows}
${copy_java_cmd_secret_windows}
-
-
+
+
${%slaveAgent.cli.run.secret} (Unix)
-
+
-${copy_secret_to_file}
+${copy_secret_to_file_unix}
${copy_agent_jar_unix}
${copy_java_cmd_secret2_unix}
${%slaveAgent.cli.run.secret} (Windows)
-
+
-${copy_secret_to_file}
+${copy_secret_to_file_windows}
${copy_agent_jar_windows}
${copy_java_cmd_secret2_windows}
From 01ee3ad4d4c5c455c9ae48f3cde947c7f8f80f02 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 09:21:11 +0100
Subject: [PATCH 06/18] Update dependency sass to v1.79.5 (#9865)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 165 +++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 160 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index 0182b878c742..62fad3f2a61a 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"postcss-preset-env": "10.0.7",
"postcss-scss": "4.0.9",
"prettier": "3.3.3",
- "sass": "1.79.4",
+ "sass": "1.79.5",
"sass-loader": "16.0.2",
"style-loader": "4.0.0",
"stylelint": "16.9.0",
diff --git a/yarn.lock b/yarn.lock
index e0ae45a3a4a4..d3b55f59b810 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1925,6 +1925,140 @@ __metadata:
languageName: node
linkType: hard
+"@parcel/watcher-android-arm64@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-android-arm64@npm:2.4.1"
+ conditions: os=android & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-darwin-arm64@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-darwin-arm64@npm:2.4.1"
+ conditions: os=darwin & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-darwin-x64@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-darwin-x64@npm:2.4.1"
+ conditions: os=darwin & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-freebsd-x64@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-freebsd-x64@npm:2.4.1"
+ conditions: os=freebsd & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-arm-glibc@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-linux-arm-glibc@npm:2.4.1"
+ conditions: os=linux & cpu=arm & libc=glibc
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-arm64-glibc@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-linux-arm64-glibc@npm:2.4.1"
+ conditions: os=linux & cpu=arm64 & libc=glibc
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-arm64-musl@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-linux-arm64-musl@npm:2.4.1"
+ conditions: os=linux & cpu=arm64 & libc=musl
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-x64-glibc@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-linux-x64-glibc@npm:2.4.1"
+ conditions: os=linux & cpu=x64 & libc=glibc
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-linux-x64-musl@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-linux-x64-musl@npm:2.4.1"
+ conditions: os=linux & cpu=x64 & libc=musl
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-win32-arm64@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-win32-arm64@npm:2.4.1"
+ conditions: os=win32 & cpu=arm64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-win32-ia32@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-win32-ia32@npm:2.4.1"
+ conditions: os=win32 & cpu=ia32
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher-win32-x64@npm:2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher-win32-x64@npm:2.4.1"
+ conditions: os=win32 & cpu=x64
+ languageName: node
+ linkType: hard
+
+"@parcel/watcher@npm:^2.4.1":
+ version: 2.4.1
+ resolution: "@parcel/watcher@npm:2.4.1"
+ dependencies:
+ "@parcel/watcher-android-arm64": "npm:2.4.1"
+ "@parcel/watcher-darwin-arm64": "npm:2.4.1"
+ "@parcel/watcher-darwin-x64": "npm:2.4.1"
+ "@parcel/watcher-freebsd-x64": "npm:2.4.1"
+ "@parcel/watcher-linux-arm-glibc": "npm:2.4.1"
+ "@parcel/watcher-linux-arm64-glibc": "npm:2.4.1"
+ "@parcel/watcher-linux-arm64-musl": "npm:2.4.1"
+ "@parcel/watcher-linux-x64-glibc": "npm:2.4.1"
+ "@parcel/watcher-linux-x64-musl": "npm:2.4.1"
+ "@parcel/watcher-win32-arm64": "npm:2.4.1"
+ "@parcel/watcher-win32-ia32": "npm:2.4.1"
+ "@parcel/watcher-win32-x64": "npm:2.4.1"
+ detect-libc: "npm:^1.0.3"
+ is-glob: "npm:^4.0.3"
+ micromatch: "npm:^4.0.5"
+ node-addon-api: "npm:^7.0.0"
+ node-gyp: "npm:latest"
+ dependenciesMeta:
+ "@parcel/watcher-android-arm64":
+ optional: true
+ "@parcel/watcher-darwin-arm64":
+ optional: true
+ "@parcel/watcher-darwin-x64":
+ optional: true
+ "@parcel/watcher-freebsd-x64":
+ optional: true
+ "@parcel/watcher-linux-arm-glibc":
+ optional: true
+ "@parcel/watcher-linux-arm64-glibc":
+ optional: true
+ "@parcel/watcher-linux-arm64-musl":
+ optional: true
+ "@parcel/watcher-linux-x64-glibc":
+ optional: true
+ "@parcel/watcher-linux-x64-musl":
+ optional: true
+ "@parcel/watcher-win32-arm64":
+ optional: true
+ "@parcel/watcher-win32-ia32":
+ optional: true
+ "@parcel/watcher-win32-x64":
+ optional: true
+ checksum: 10c0/33b7112094b9eb46c234d824953967435b628d3d93a0553255e9910829b84cab3da870153c3a870c31db186dc58f3b2db81382fcaee3451438aeec4d786a6211
+ languageName: node
+ linkType: hard
+
"@pkgjs/parseargs@npm:^0.11.0":
version: 0.11.0
resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -3142,6 +3276,15 @@ __metadata:
languageName: node
linkType: hard
+"detect-libc@npm:^1.0.3":
+ version: 1.0.3
+ resolution: "detect-libc@npm:1.0.3"
+ bin:
+ detect-libc: ./bin/detect-libc.js
+ checksum: 10c0/4da0deae9f69e13bc37a0902d78bf7169480004b1fed3c19722d56cff578d16f0e11633b7fbf5fb6249181236c72e90024cbd68f0b9558ae06e281f47326d50d
+ languageName: node
+ linkType: hard
+
"dir-glob@npm:^3.0.1":
version: 3.0.1
resolution: "dir-glob@npm:3.0.1"
@@ -4248,7 +4391,7 @@ __metadata:
postcss-preset-env: "npm:10.0.7"
postcss-scss: "npm:4.0.9"
prettier: "npm:3.3.3"
- sass: "npm:1.79.4"
+ sass: "npm:1.79.5"
sass-loader: "npm:16.0.2"
sortablejs: "npm:1.15.3"
style-loader: "npm:4.0.0"
@@ -4639,7 +4782,7 @@ __metadata:
languageName: node
linkType: hard
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.8":
+"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5, micromatch@npm:^4.0.8":
version: 4.0.8
resolution: "micromatch@npm:4.0.8"
dependencies:
@@ -4832,6 +4975,15 @@ __metadata:
languageName: node
linkType: hard
+"node-addon-api@npm:^7.0.0":
+ version: 7.1.1
+ resolution: "node-addon-api@npm:7.1.1"
+ dependencies:
+ node-gyp: "npm:latest"
+ checksum: 10c0/fb32a206276d608037fa1bcd7e9921e177fe992fc610d098aa3128baca3c0050fc1e014fa007e9b3874cf865ddb4f5bd9f43ccb7cbbbe4efaff6a83e920b17e9
+ languageName: node
+ linkType: hard
+
"node-gyp@npm:latest":
version: 10.2.0
resolution: "node-gyp@npm:10.2.0"
@@ -6209,16 +6361,17 @@ __metadata:
languageName: node
linkType: hard
-"sass@npm:1.79.4":
- version: 1.79.4
- resolution: "sass@npm:1.79.4"
+"sass@npm:1.79.5":
+ version: 1.79.5
+ resolution: "sass@npm:1.79.5"
dependencies:
+ "@parcel/watcher": "npm:^2.4.1"
chokidar: "npm:^4.0.0"
immutable: "npm:^4.0.0"
source-map-js: "npm:>=0.6.2 <2.0.0"
bin:
sass: sass.js
- checksum: 10c0/505ff0d9267d0fb990971e617acfeabf7c060c55d4cef68fe8a4bc693e7ea88ae7d7caeca3975e4b453459ba4a707b6e5b6979fc9395a7e08f0a43ca6aed06b8
+ checksum: 10c0/7331865fd1d0c03e6e180a4fe0e175ac1bf1214f6c77f0d99ad72fbe2ed9ede3fab8a64c0c41471cb8a358a9d11624ec59a49283f9b6070eb99c522b34b814bf
languageName: node
linkType: hard
From fe80df5c5119cdf8584f80a43b97293f4c74adf9 Mon Sep 17 00:00:00 2001
From: Vincent Latombe
Date: Mon, 14 Oct 2024 20:23:01 +0200
Subject: [PATCH 07/18] Create a new taglib to capture the save/apply bottom
bar (#9813)
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
.../main/java/hudson/logging/LogRecorder.java | 3 +-
core/src/main/java/hudson/model/Computer.java | 3 +-
core/src/main/java/jenkins/model/Jenkins.java | 2 +-
.../logging/LogRecorder/configure.jelly | 6 +--
.../hudson/model/Computer/configure.jelly | 9 +----
.../hudson/model/ComputerSet/configure.jelly | 8 +---
.../hudson/model/Job/configure.jelly | 10 +----
.../hudson/model/Run/configure.jelly | 11 +-----
.../hudson/model/View/configure.jelly | 6 +--
.../index.jelly | 7 +---
.../index.jelly | 7 +---
.../index.jelly | 7 +---
.../index.jelly | 7 +---
.../index.jelly | 5 +--
.../hudson/slaves/Cloud/configure.jelly | 9 +----
.../jenkins/agents/CloudSet/index.jelly | 1 +
.../AppearanceGlobalConfiguration/index.jelly | 7 +---
.../Jenkins/MasterComputer/configure.jelly | 6 +--
.../jenkins/model/Jenkins/configure.jelly | 14 ++-----
.../resources/lib/form/saveApplyBar.jelly | 39 +++++++++++++++++++
20 files changed, 66 insertions(+), 101 deletions(-)
create mode 100644 core/src/main/resources/lib/form/saveApplyBar.jelly
diff --git a/core/src/main/java/hudson/logging/LogRecorder.java b/core/src/main/java/hudson/logging/LogRecorder.java
index c11c1bbfa57e..a4c42bdfcba7 100644
--- a/core/src/main/java/hudson/logging/LogRecorder.java
+++ b/core/src/main/java/hudson/logging/LogRecorder.java
@@ -44,6 +44,7 @@
import hudson.remoting.VirtualChannel;
import hudson.slaves.ComputerListener;
import hudson.util.CopyOnWriteList;
+import hudson.util.FormApply;
import hudson.util.FormValidation;
import hudson.util.HttpResponses;
import hudson.util.RingBufferLogHandler;
@@ -463,7 +464,7 @@ public synchronized void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rs
save();
if (oldFile != null) oldFile.delete();
- rsp.sendRedirect2(redirect);
+ FormApply.success(redirect).generateResponse(req, rsp, null);
}
@RequirePOST
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 1047fe97000c..9e3037edf83c 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -66,6 +66,7 @@
import hudson.util.DaemonThreadFactory;
import hudson.util.EditDistance;
import hudson.util.ExceptionCatchingThreadFactory;
+import hudson.util.FormApply;
import hudson.util.Futures;
import hudson.util.IOUtils;
import hudson.util.NamingThreadFactory;
@@ -1512,7 +1513,7 @@ public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOE
}
// take the user back to the agent top page.
- rsp.sendRedirect2("../" + result.getNodeName() + '/');
+ FormApply.success("../" + result.getNodeName() + '/').generateResponse(req, rsp, null);
}
/**
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 90ffceefb456..dc2c7926f605 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -4159,7 +4159,7 @@ public synchronized void doConfigExecutorsSubmit(StaplerRequest2 req, StaplerRes
updateComputerList();
- rsp.sendRedirect(req.getContextPath() + '/' + toComputer().getUrl()); // back to the computer page
+ FormApply.success(req.getContextPath() + '/' + toComputer().getUrl()).generateResponse(req, rsp, null);
}
/**
diff --git a/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly b/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly
index b49ccc278858..ef7c6f3781b2 100644
--- a/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly
+++ b/core/src/main/resources/hudson/logging/LogRecorder/configure.jelly
@@ -66,12 +66,8 @@ THE SOFTWARE.
-
-
-
-
+
-
diff --git a/core/src/main/resources/hudson/model/Computer/configure.jelly b/core/src/main/resources/hudson/model/Computer/configure.jelly
index bd33078013cd..ce76f5fb2d3b 100644
--- a/core/src/main/resources/hudson/model/Computer/configure.jelly
+++ b/core/src/main/resources/hudson/model/Computer/configure.jelly
@@ -46,15 +46,8 @@ THE SOFTWARE.
-
-
-
-
-
+
-
-
-
diff --git a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
index 9e58aeda59e6..3483113b0fb4 100644
--- a/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
+++ b/core/src/main/resources/hudson/model/ComputerSet/configure.jelly
@@ -45,14 +45,8 @@ THE SOFTWARE.
instances="${it.monitors}"
forceRowSet="true"/>
-
-
-
-
-
-
+
-
diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly
index d226a966558d..3d347a863945 100644
--- a/core/src/main/resources/hudson/model/Job/configure.jelly
+++ b/core/src/main/resources/hudson/model/Job/configure.jelly
@@ -63,16 +63,8 @@ THE SOFTWARE.
-
-
-
-
-
-
+
-
-
-
diff --git a/core/src/main/resources/hudson/model/Run/configure.jelly b/core/src/main/resources/hudson/model/Run/configure.jelly
index edc2a24e904e..ff2bc3f09944 100644
--- a/core/src/main/resources/hudson/model/Run/configure.jelly
+++ b/core/src/main/resources/hudson/model/Run/configure.jelly
@@ -38,17 +38,8 @@ THE SOFTWARE.
-
-
-
-
-
-
-
+
-
-
-
diff --git a/core/src/main/resources/hudson/model/View/configure.jelly b/core/src/main/resources/hudson/model/View/configure.jelly
index 6f2ff2744fe1..1d47dd542287 100644
--- a/core/src/main/resources/hudson/model/View/configure.jelly
+++ b/core/src/main/resources/hudson/model/View/configure.jelly
@@ -66,12 +66,8 @@ THE SOFTWARE.
-
-
-
-
+
-
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
index c6b458cecfe9..006458e02048 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAccountAction/index.jelly
@@ -62,11 +62,8 @@ THE SOFTWARE.
-
-
-
-
-
+
+
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
index 0d90ad4b2d76..eeceeb7eee0c 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryAppearanceAction/index.jelly
@@ -62,11 +62,8 @@ THE SOFTWARE.
-
-
-
-
-
+
+
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
index 0d90ad4b2d76..eeceeb7eee0c 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryExperimentalAction/index.jelly
@@ -62,11 +62,8 @@ THE SOFTWARE.
-
-
-
-
-
+
+
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
index 6971e5abf8d0..ea96f1bc39e8 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategoryPreferencesAction/index.jelly
@@ -62,11 +62,8 @@ THE SOFTWARE.
-
-
-
-
-
+
+
diff --git a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
index 0d90501fbbb0..a50387704139 100644
--- a/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
+++ b/core/src/main/resources/hudson/model/userproperty/UserPropertyCategorySecurityAction/index.jelly
@@ -64,10 +64,7 @@ THE SOFTWARE.
-
-
-
-
+
diff --git a/core/src/main/resources/hudson/slaves/Cloud/configure.jelly b/core/src/main/resources/hudson/slaves/Cloud/configure.jelly
index f7479a743176..acb1e2d980fa 100644
--- a/core/src/main/resources/hudson/slaves/Cloud/configure.jelly
+++ b/core/src/main/resources/hudson/slaves/Cloud/configure.jelly
@@ -37,15 +37,8 @@ THE SOFTWARE.
-
-
-
-
-
+
-
-
-
diff --git a/core/src/main/resources/jenkins/agents/CloudSet/index.jelly b/core/src/main/resources/jenkins/agents/CloudSet/index.jelly
index f0d1fa0f9c69..3bf3f0183e44 100644
--- a/core/src/main/resources/jenkins/agents/CloudSet/index.jelly
+++ b/core/src/main/resources/jenkins/agents/CloudSet/index.jelly
@@ -35,6 +35,7 @@ THE SOFTWARE.
+
diff --git a/core/src/main/resources/jenkins/appearance/AppearanceGlobalConfiguration/index.jelly b/core/src/main/resources/jenkins/appearance/AppearanceGlobalConfiguration/index.jelly
index 9c4863c2b3f1..a49d8c765acf 100644
--- a/core/src/main/resources/jenkins/appearance/AppearanceGlobalConfiguration/index.jelly
+++ b/core/src/main/resources/jenkins/appearance/AppearanceGlobalConfiguration/index.jelly
@@ -44,12 +44,7 @@ THE SOFTWARE.
-
-
-
-
-
-
+
diff --git a/core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure.jelly
index d71a75949106..d01b9dc210a2 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/MasterComputer/configure.jelly
@@ -55,11 +55,7 @@ THE SOFTWARE.
-
-
-
-
-
+
diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
index 34b067bec99c..b24f0e872cf4 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
+++ b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly
@@ -32,6 +32,7 @@ THE SOFTWARE.
+
@@ -46,7 +47,6 @@ THE SOFTWARE.
-
@@ -60,17 +60,9 @@ THE SOFTWARE.
-
-
-
-
-
-
-
+
+
-
-
-
diff --git a/core/src/main/resources/lib/form/saveApplyBar.jelly b/core/src/main/resources/lib/form/saveApplyBar.jelly
new file mode 100644
index 000000000000..d3860e7e9620
--- /dev/null
+++ b/core/src/main/resources/lib/form/saveApplyBar.jelly
@@ -0,0 +1,39 @@
+
+
+
+
+
+ Creates the bottom bar for the "Save" and "Apply" buttons.
+ In read only mode (<j:set var="readOnlyMode" value="true"/>) the buttons are not displayed.
+
+
+
+
+
+
+
+
+
+
From 8458d66713fc400113d08804c0a6ff4ee9212114 Mon Sep 17 00:00:00 2001
From: Markus Winter
Date: Mon, 14 Oct 2024 20:23:26 +0200
Subject: [PATCH 08/18] [JENKINS-73813] Show a notification when scheduling a
build fails (#9787)
Co-authored-by: Jan Faracik <43062514+janfaracik@users.noreply.github.com>
Co-authored-by: Tim Jacomb
---
.../hudson/views/BuildButtonColumn/column.jelly | 5 ++++-
.../views/BuildButtonColumn/column.properties | 1 +
.../hudson/views/BuildButtonColumn/icon.js | 8 +++++++-
.../lib/hudson/project/configurable.jelly | 2 +-
.../lib/hudson/project/configurable.properties | 1 +
.../hudson/project/configurable/configurable.js | 8 +++++++-
core/src/main/resources/lib/layout/task.jelly | 1 +
core/src/main/resources/lib/layout/task/task.js | 8 +++++++-
src/main/js/components/dropdowns/jumplists.js | 16 ++++++++++++----
9 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
index 8cced8eccbda..ce12897c5efa 100644
--- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
+++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
@@ -37,7 +37,10 @@ THE SOFTWARE.
-
+
diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.properties b/core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
index bf14a6abb2db..86d64eaaf683 100644
--- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
+++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.properties
@@ -23,3 +23,4 @@
Task_scheduled={0} scheduled
Schedule_a_task=Schedule a {1} for {0}
Schedule_a_task_with_parameters=Schedule a {1} with parameters for {0}
+Task_schedule_failed=Failed to schedule build for {0}
diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/icon.js b/core/src/main/resources/hudson/views/BuildButtonColumn/icon.js
index 80977933eaaa..936c87b0766a 100644
--- a/core/src/main/resources/hudson/views/BuildButtonColumn/icon.js
+++ b/core/src/main/resources/hudson/views/BuildButtonColumn/icon.js
@@ -5,6 +5,7 @@ Behaviour.specify(
function (e) {
var url = e.getAttribute("data-url");
var message = e.getAttribute("data-notification");
+ var failure = e.getAttribute("data-failure");
var id = e.getAttribute("data-id");
var icon = document.getElementById(id);
@@ -12,8 +13,13 @@ Behaviour.specify(
fetch(url, {
method: "post",
headers: crumb.wrap({}),
+ }).then((rsp) => {
+ if (rsp.ok) {
+ notificationBar.show(message, notificationBar.SUCCESS);
+ } else {
+ notificationBar.show(failure, notificationBar.ERROR);
+ }
});
- hoverNotification(message, this, -100);
return false;
};
},
diff --git a/core/src/main/resources/lib/hudson/project/configurable.jelly b/core/src/main/resources/lib/hudson/project/configurable.jelly
index 44bac9b2b9bf..907068bcfd6e 100644
--- a/core/src/main/resources/lib/hudson/project/configurable.jelly
+++ b/core/src/main/resources/lib/hudson/project/configurable.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
-
+
diff --git a/core/src/main/resources/lib/hudson/project/configurable.properties b/core/src/main/resources/lib/hudson/project/configurable.properties
index b47b64121055..e95746b7dd99 100644
--- a/core/src/main/resources/lib/hudson/project/configurable.properties
+++ b/core/src/main/resources/lib/hudson/project/configurable.properties
@@ -22,3 +22,4 @@
delete=Delete {0}
delete.confirm=Delete the {0} ‘{1}’?
+buildFailed=Failed to schedule build. Reload the page and try again.
diff --git a/core/src/main/resources/lib/hudson/project/configurable/configurable.js b/core/src/main/resources/lib/hudson/project/configurable/configurable.js
index a96e64219502..8ea9dacf17ae 100644
--- a/core/src/main/resources/lib/hudson/project/configurable/configurable.js
+++ b/core/src/main/resources/lib/hudson/project/configurable/configurable.js
@@ -4,12 +4,18 @@
function foo(el, ev) {
let parameterized = el.dataset.parameterized;
let success = el.dataset.buildSuccess;
+ let failure = el.dataset.buildFailure;
if (parameterized === "false") {
fetch(el.href, {
method: "post",
headers: crumb.wrap({}),
+ }).then((rsp) => {
+ if (rsp.ok) {
+ notificationBar.show(success, notificationBar.SUCCESS);
+ } else {
+ notificationBar.show(failure, notificationBar.ERROR);
+ }
});
- hoverNotification(success, ev.target.parentNode);
ev.preventDefault();
}
}
diff --git a/core/src/main/resources/lib/layout/task.jelly b/core/src/main/resources/lib/layout/task.jelly
index 7afcbcfef821..550d9282e51b 100644
--- a/core/src/main/resources/lib/layout/task.jelly
+++ b/core/src/main/resources/lib/layout/task.jelly
@@ -186,6 +186,7 @@ THE SOFTWARE.
href="${href}"
class="task-link task-link-no-confirm ${isCurrent ? 'task-link--active' : ''}"
data-task-success="${%Done.}"
+ data-task-failure="${%Failed.}"
data-task-post="${attrs.post}"
ATTRIBUTES="${attrs}"
EXCEPT="badge confirmationMessage contextMenu destructive enabled href icon permission permissions post requiresConfirmation title">
diff --git a/core/src/main/resources/lib/layout/task/task.js b/core/src/main/resources/lib/layout/task/task.js
index 5d6fd6fd008c..b0e95063bec8 100644
--- a/core/src/main/resources/lib/layout/task/task.js
+++ b/core/src/main/resources/lib/layout/task/task.js
@@ -6,6 +6,7 @@ Behaviour.specify("a.task-link-no-confirm", "task-link", 0, function (el) {
let post = el.dataset.taskPost;
let callback = el.dataset.callback;
let success = el.dataset.taskSuccess;
+ let failure = el.dataset.taskFailure;
let href = el.href;
if (callback !== undefined) {
@@ -20,8 +21,13 @@ Behaviour.specify("a.task-link-no-confirm", "task-link", 0, function (el) {
fetch(href, {
method: "post",
headers: crumb.wrap({}),
+ }).then((rsp) => {
+ if (rsp.ok) {
+ notificationBar(success, notificationBar.SUCCESS);
+ } else {
+ notificationBar(failure, notificationBar.ERROR);
+ }
});
- hoverNotification(success, el.parentNode);
ev.preventDefault();
};
}
diff --git a/src/main/js/components/dropdowns/jumplists.js b/src/main/js/components/dropdowns/jumplists.js
index f831f452bafe..c1df72306c25 100644
--- a/src/main/js/components/dropdowns/jumplists.js
+++ b/src/main/js/components/dropdowns/jumplists.js
@@ -105,11 +105,19 @@ function mapChildrenItemsToDropdownItems(items) {
fetch(item.url, {
method: "post",
headers: crumb.wrap({}),
+ }).then((rsp) => {
+ if (rsp.ok) {
+ notificationBar.show(
+ item.displayName + ": Done.",
+ notificationBar.SUCCESS,
+ );
+ } else {
+ notificationBar.show(
+ item.displayName + ": Failed.",
+ notificationBar.ERROR,
+ );
+ }
});
- notificationBar.show(
- item.displayName + ": Done.",
- notificationBar.SUCCESS,
- );
}
}
},
From 1c14bdc4de794db80d13f817e721def64f2f40e6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 11:44:14 -0700
Subject: [PATCH 09/18] Update dependency io.jenkins.plugins:asm-api to
v9.7.1-97.v4cc844130d97 (#9866)
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 b5cb11d590e5..b75dbca848d2 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -502,7 +502,7 @@ THE SOFTWARE.
io.jenkins.plugins
asm-api
- 9.7.1-95.v9f552033802a_
+ 9.7.1-97.v4cc844130d97
hpi
From 7520ae670f47d934f5d5637cc126ba6b256bae01 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:25:55 -0700
Subject: [PATCH 10/18] Update dependency
org.jenkins-ci.plugins:script-security to v1365 (#9870)
Co-authored-by: renovate[bot] <29139614+renovate[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 6bf29cc3138d..d7ed09f844c1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -118,7 +118,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
script-security
- 1362.v67dc1f0e1b_b_3
+ 1365.v4778ca_84b_de5
org.jenkins-ci.plugins.workflow
diff --git a/war/pom.xml b/war/pom.xml
index b75dbca848d2..43c94afb6048 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -307,7 +307,7 @@ THE SOFTWARE.
org.jenkins-ci.plugins
script-security
- 1362.v67dc1f0e1b_b_3
+ 1365.v4778ca_84b_de5
hpi
From 91b46327f72ac173a5a900969ed2b07837446e09 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 14:26:12 -0700
Subject: [PATCH 11/18] Update dependency io.jenkins.plugins:json-api to
v20240303-101.v7a_8666713110 (#9868)
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 43c94afb6048..aeec9af66846 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -551,7 +551,7 @@ THE SOFTWARE.
io.jenkins.plugins
json-api
- 20240303-41.v94e11e6de726
+ 20240303-101.v7a_8666713110
hpi
From b21f42837783a0a817b7fc4e355f2cb361c9a084 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:52:44 +0000
Subject: [PATCH 12/18] [maven-release-plugin] prepare release jenkins-2.481
---
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 0065b595ae9a..008ccf3ea993 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.481
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 2473629d23cc..17c38b15a83f 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.481
cli
diff --git a/core/pom.xml b/core/pom.xml
index 9bff5e5ad0b2..a3c6d3f3eda9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.481
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index fe1e89a120dc..2ad4119f96c1 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.481
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index 1a472b3fd02a..4682b9629872 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.481
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.481
https://github.com/jenkinsci/jenkins
@@ -75,7 +75,7 @@ THE SOFTWARE.
2.481
-SNAPSHOT
- 2024-10-08T14:08:31Z
+ 2024-10-15T10:33:41Z
github
diff --git a/test/pom.xml b/test/pom.xml
index d7ed09f844c1..b039d4876485 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.481
jenkins-test
diff --git a/war/pom.xml b/war/pom.xml
index aeec9af66846..0ef1e6ac6f8e 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- ${revision}${changelist}
+ 2.481
jenkins-war
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index 2253163b3c4c..1fbb43e55cb3 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.481
../..
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 178413f92c8e..6ceb1d232003 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.481
../..
From b5b9876b516ef198ae21b6c0625ccd216242f872 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
<66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 15 Oct 2024 13:53:08 +0000
Subject: [PATCH 13/18] [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 008ccf3ea993..0065b595ae9a 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.481
+ ${revision}${changelist}
jenkins-bom
diff --git a/cli/pom.xml b/cli/pom.xml
index 17c38b15a83f..2473629d23cc 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.481
+ ${revision}${changelist}
cli
diff --git a/core/pom.xml b/core/pom.xml
index a3c6d3f3eda9..9bff5e5ad0b2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.481
+ ${revision}${changelist}
jenkins-core
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 2ad4119f96c1..fe1e89a120dc 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
org.jenkins-ci.main
jenkins-parent
- 2.481
+ ${revision}${changelist}
jenkins-coverage
diff --git a/pom.xml b/pom.xml
index 4682b9629872..a8fc54f26297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.481
+ ${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.481
+ ${scmTag}
https://github.com/jenkinsci/jenkins
@@ -73,9 +73,9 @@ THE SOFTWARE.
- 2.481
+ 2.482
-SNAPSHOT
- 2024-10-15T10:33:41Z
+ 2024-10-15T13:52:44Z
github
diff --git a/test/pom.xml b/test/pom.xml
index b039d4876485..d7ed09f844c1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.481
+ ${revision}${changelist}
jenkins-test
diff --git a/war/pom.xml b/war/pom.xml
index 0ef1e6ac6f8e..aeec9af66846 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
org.jenkins-ci.main
jenkins-parent
- 2.481
+ ${revision}${changelist}
jenkins-war
diff --git a/websocket/jetty12-ee9/pom.xml b/websocket/jetty12-ee9/pom.xml
index 1fbb43e55cb3..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.481
+ ${revision}${changelist}
../..
diff --git a/websocket/spi/pom.xml b/websocket/spi/pom.xml
index 6ceb1d232003..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.481
+ ${revision}${changelist}
../..
From aa6876b2a858e4501b6db65d8f343e463d16ad1f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 07:58:58 -0700
Subject: [PATCH 14/18] Update dependency stylelint to v16.10.0 (#9869)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
yarn.lock | 75 ++++++++++++++++++++++++++++++++++------------------
2 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/package.json b/package.json
index 62fad3f2a61a..d1c90ea0da96 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"sass": "1.79.5",
"sass-loader": "16.0.2",
"style-loader": "4.0.0",
- "stylelint": "16.9.0",
+ "stylelint": "16.10.0",
"stylelint-checkstyle-reporter": "1.0.0",
"stylelint-config-standard": "36.0.1",
"webpack": "5.95.0",
diff --git a/yarn.lock b/yarn.lock
index d3b55f59b810..332960baf1ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3034,10 +3034,10 @@ __metadata:
languageName: node
linkType: hard
-"css-functions-list@npm:^3.2.2":
- version: 3.2.2
- resolution: "css-functions-list@npm:3.2.2"
- checksum: 10c0/8638a63d0cf1bdc50d4a752ec1c94a57e9953c3b03eace4f5526db20bec3c061e95089f905dbb4999c44b9780ce777ba856967560f6d15119a303f6030901c10
+"css-functions-list@npm:^3.2.3":
+ version: 3.2.3
+ resolution: "css-functions-list@npm:3.2.3"
+ checksum: 10c0/03f9ed34eeed310d2b1cf0e524eea02bc5f87854a4de85f8957ea432ab1036841a3fb00879590519f7bb8fda40d992ce7a72fa9b61696ca1dc53b90064858f96
languageName: node
linkType: hard
@@ -3139,6 +3139,16 @@ __metadata:
languageName: node
linkType: hard
+"css-tree@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "css-tree@npm:3.0.0"
+ dependencies:
+ mdn-data: "npm:2.10.0"
+ source-map-js: "npm:^1.0.1"
+ checksum: 10c0/43d44fdf7004ae91d73d486f17894fef77efa33747a6752b9241cf0f5fb47fabc16ec34a96a993651d9014dfdeee803d7c5fcd3548214252ee19f4e5c98999b2
+ languageName: node
+ linkType: hard
+
"css-tree@npm:~2.2.0":
version: 2.2.1
resolution: "css-tree@npm:2.2.1"
@@ -3242,7 +3252,7 @@ __metadata:
languageName: node
linkType: hard
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.7":
version: 4.3.7
resolution: "debug@npm:4.3.7"
dependencies:
@@ -3702,7 +3712,7 @@ __metadata:
languageName: node
linkType: hard
-"file-entry-cache@npm:^9.0.0":
+"file-entry-cache@npm:^9.1.0":
version: 9.1.0
resolution: "file-entry-cache@npm:9.1.0"
dependencies:
@@ -4136,13 +4146,20 @@ __metadata:
languageName: node
linkType: hard
-"ignore@npm:^5.2.0, ignore@npm:^5.3.2":
+"ignore@npm:^5.2.0":
version: 5.3.2
resolution: "ignore@npm:5.3.2"
checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337
languageName: node
linkType: hard
+"ignore@npm:^6.0.2":
+ version: 6.0.2
+ resolution: "ignore@npm:6.0.2"
+ checksum: 10c0/9a38feac1861906a78ba0f03e8ef3cd6b0526dce2a1a84e1009324b557763afeb9c3ebcc04666b21f7bbf71adda45e76781bb9e2eaa0903d45dcaded634454f5
+ languageName: node
+ linkType: hard
+
"immutable@npm:^4.0.0":
version: 4.3.7
resolution: "immutable@npm:4.3.7"
@@ -4395,7 +4412,7 @@ __metadata:
sass-loader: "npm:16.0.2"
sortablejs: "npm:1.15.3"
style-loader: "npm:4.0.0"
- stylelint: "npm:16.9.0"
+ stylelint: "npm:16.10.0"
stylelint-checkstyle-reporter: "npm:1.0.0"
stylelint-config-standard: "npm:36.0.1"
tippy.js: "npm:6.3.7"
@@ -4761,6 +4778,13 @@ __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
+ languageName: node
+ linkType: hard
+
"meow@npm:^13.2.0":
version: 13.2.0
resolution: "meow@npm:13.2.0"
@@ -6006,12 +6030,12 @@ __metadata:
languageName: node
linkType: hard
-"postcss-safe-parser@npm:^7.0.0":
- version: 7.0.0
- resolution: "postcss-safe-parser@npm:7.0.0"
+"postcss-safe-parser@npm:^7.0.1":
+ version: 7.0.1
+ resolution: "postcss-safe-parser@npm:7.0.1"
peerDependencies:
postcss: ^8.4.31
- checksum: 10c0/4217afd8ce2809e959dc365e4675f499303cc6b91f94db06c8164422822db2d3b3124df701ee2234db4127ad05619b016bfb9c2bccae9bf9cf898a396f1632c9
+ checksum: 10c0/6957b10b818bd8d4664ec0e548af967f7549abedfb37f844d389571d36af681340f41f9477b9ccf34bcc7599bdef222d1d72e79c64373001fae77089fba6d965
languageName: node
linkType: hard
@@ -6075,7 +6099,7 @@ __metadata:
languageName: node
linkType: hard
-"postcss@npm:8.4.47, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
+"postcss@npm:8.4.47, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.47":
version: 8.4.47
resolution: "postcss@npm:8.4.47"
dependencies:
@@ -6604,7 +6628,7 @@ __metadata:
languageName: node
linkType: hard
-"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
+"strip-ansi@npm:^7.0.1":
version: 7.1.0
resolution: "strip-ansi@npm:7.1.0"
dependencies:
@@ -6673,9 +6697,9 @@ __metadata:
languageName: node
linkType: hard
-"stylelint@npm:16.9.0":
- version: 16.9.0
- resolution: "stylelint@npm:16.9.0"
+"stylelint@npm:16.10.0":
+ version: 16.10.0
+ resolution: "stylelint@npm:16.10.0"
dependencies:
"@csstools/css-parser-algorithms": "npm:^3.0.1"
"@csstools/css-tokenizer": "npm:^3.0.1"
@@ -6685,17 +6709,17 @@ __metadata:
balanced-match: "npm:^2.0.0"
colord: "npm:^2.9.3"
cosmiconfig: "npm:^9.0.0"
- css-functions-list: "npm:^3.2.2"
- css-tree: "npm:^2.3.1"
- debug: "npm:^4.3.6"
+ css-functions-list: "npm:^3.2.3"
+ css-tree: "npm:^3.0.0"
+ debug: "npm:^4.3.7"
fast-glob: "npm:^3.3.2"
fastest-levenshtein: "npm:^1.0.16"
- file-entry-cache: "npm:^9.0.0"
+ file-entry-cache: "npm:^9.1.0"
global-modules: "npm:^2.0.0"
globby: "npm:^11.1.0"
globjoin: "npm:^0.1.4"
html-tags: "npm:^3.3.1"
- ignore: "npm:^5.3.2"
+ ignore: "npm:^6.0.2"
imurmurhash: "npm:^0.1.4"
is-plain-object: "npm:^5.0.0"
known-css-properties: "npm:^0.34.0"
@@ -6704,21 +6728,20 @@ __metadata:
micromatch: "npm:^4.0.8"
normalize-path: "npm:^3.0.0"
picocolors: "npm:^1.0.1"
- postcss: "npm:^8.4.41"
+ postcss: "npm:^8.4.47"
postcss-resolve-nested-selector: "npm:^0.1.6"
- postcss-safe-parser: "npm:^7.0.0"
+ postcss-safe-parser: "npm:^7.0.1"
postcss-selector-parser: "npm:^6.1.2"
postcss-value-parser: "npm:^4.2.0"
resolve-from: "npm:^5.0.0"
string-width: "npm:^4.2.3"
- strip-ansi: "npm:^7.1.0"
supports-hyperlinks: "npm:^3.1.0"
svg-tags: "npm:^1.0.0"
table: "npm:^6.8.2"
write-file-atomic: "npm:^5.0.1"
bin:
stylelint: bin/stylelint.mjs
- checksum: 10c0/d3ff9c8945c56b04a2fa16ec33d163325496d5db94b6fcb5adf74c76f7f794ac992888273f9a3317652ba8b6195168b2ffff382ca2a667a241e2ace8c9505ae2
+ checksum: 10c0/d07dd156c225d16c740995daacd78090f7fc317602e87bda2fca323a4ae427a8526d724f3089df3b2185df4520f987547668ceea9b30985988ccbc514034aa21
languageName: node
linkType: hard
From 8d5c614237aeb7114d3329e05cc12a023025bb31 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 07:59:42 -0700
Subject: [PATCH 15/18] Update jenkins/ath Docker tag to v6040 (#9872)
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 7009d692b8d0..3326a2118260 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=6038.v190f938efc87
+export ATH_VERSION=6040.v72ed2f5b_59f6
if [[ $# -eq 0 ]]; then
export JDK=17
From 29a711458a48578c08a6027b2b2adf57be916a0c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 08:00:14 -0700
Subject: [PATCH 16/18] Update dependency io.jenkins.plugins:echarts-api to
v5.5.1-2 (#9873)
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 aeec9af66846..b7b41897bc9e 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -365,7 +365,7 @@ THE SOFTWARE.
io.jenkins.plugins
echarts-api
- 5.5.1-1
+ 5.5.1-2
hpi
From b50cf513c151ad81b0c6dd18c4b66e5c0d02c2bd Mon Sep 17 00:00:00 2001
From: Vincent Latombe
Date: Tue, 15 Oct 2024 17:32:02 +0200
Subject: [PATCH 17/18] [JENKINS-30101][JENKINS-30175] Simplify persistence
design for temporarily offline status (#9855)
Co-authored-by: Jesse Glick
---
core/src/main/java/hudson/model/Computer.java | 109 ++++++++++--------
core/src/main/java/hudson/model/Node.java | 26 ++---
.../AbstractNodeMonitorDescriptor.java | 4 +-
.../main/java/hudson/slaves/OfflineCause.java | 32 ++++-
.../model/Computer/setOfflineCause.jelly | 2 +-
.../hudson/cli/OfflineNodeCommandTest.java | 4 +-
test/src/test/java/hudson/model/NodeTest.java | 10 +-
7 files changed, 113 insertions(+), 74 deletions(-)
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 9e3037edf83c..8c3d814c91fe 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -180,11 +180,6 @@
private long connectTime = 0;
- /**
- * True if Jenkins shouldn't start new builds on this node.
- */
- private boolean temporarilyOffline;
-
/**
* {@link Node} object may be created and deleted independently
* from this object.
@@ -361,6 +356,13 @@ public AnnotatedLargeText getLogText() {
*/
@Exported
public OfflineCause getOfflineCause() {
+ var node = getNode();
+ if (node != null) {
+ var temporaryOfflineCause = node.getTemporaryOfflineCause();
+ if (temporaryOfflineCause != null) {
+ return temporaryOfflineCause;
+ }
+ }
return offlineCause;
}
@@ -372,6 +374,7 @@ public boolean hasOfflineCause() {
@Exported
@Override
public String getOfflineCauseReason() {
+ var offlineCause = getOfflineCause();
if (offlineCause == null) {
return "";
}
@@ -550,7 +553,7 @@ public void cliDisconnect(String cause) throws ExecutionException, InterruptedEx
@Deprecated
public void cliOffline(String cause) throws ExecutionException, InterruptedException {
checkPermission(DISCONNECT);
- setTemporarilyOffline(true, new ByCLI(cause));
+ setTemporaryOfflineCause(new ByCLI(cause));
}
/**
@@ -559,7 +562,7 @@ public void cliOffline(String cause) throws ExecutionException, InterruptedExcep
@Deprecated
public void cliOnline() throws ExecutionException, InterruptedException {
checkPermission(CONNECT);
- setTemporarilyOffline(false, null);
+ setTemporaryOfflineCause(null);
}
/**
@@ -621,7 +624,7 @@ public BuildTimelineWidget getTimeline() {
@Exported
@Override
public boolean isOffline() {
- return temporarilyOffline || getChannel() == null;
+ return isTemporarilyOffline() || getChannel() == null;
}
public final boolean isOnline() {
@@ -670,41 +673,64 @@ public boolean isLaunchSupported() {
@Exported
@Deprecated
public boolean isTemporarilyOffline() {
- return temporarilyOffline;
+ var node = getNode();
+ return node != null && node.isTemporarilyOffline();
}
/**
* @deprecated as of 1.320.
- * Use {@link #setTemporarilyOffline(boolean, OfflineCause)}
+ * Use {@link #setTemporaryOfflineCause(OfflineCause)}
*/
@Deprecated
public void setTemporarilyOffline(boolean temporarilyOffline) {
- setTemporarilyOffline(temporarilyOffline, null);
+ setTemporaryOfflineCause(temporarilyOffline ? new OfflineCause.LegacyOfflineCause() : null);
+ }
+
+ /**
+ * @deprecated
+ * Use {@link #setTemporaryOfflineCause(OfflineCause)} instead.
+ */
+ @Deprecated(since = "TODO")
+ public void setTemporarilyOffline(boolean temporarilyOffline, OfflineCause cause) {
+ if (cause == null) {
+ setTemporarilyOffline(temporarilyOffline);
+ } else {
+ setTemporaryOfflineCause(temporarilyOffline ? cause : null);
+ }
}
/**
* Marks the computer as temporarily offline. This retains the underlying
* {@link Channel} connection, but prevent builds from executing.
*
- * @param cause
- * If the first argument is true, specify the reason why the node is being put
- * offline.
+ * @param temporaryOfflineCause The reason why the node is being put offline.
+ * If null, this cancels the status
+ * @since TODO
*/
- public void setTemporarilyOffline(boolean temporarilyOffline, OfflineCause cause) {
- offlineCause = temporarilyOffline ? cause : null;
- this.temporarilyOffline = temporarilyOffline;
- Node node = getNode();
- if (node != null) {
- node.setTemporaryOfflineCause(offlineCause);
+ public void setTemporaryOfflineCause(@CheckForNull OfflineCause temporaryOfflineCause) {
+ var node = getNode();
+ if (node == null) {
+ throw new IllegalStateException("Can't set a temporary offline cause if the node has been removed");
}
- synchronized (statusChangeLock) {
- statusChangeLock.notifyAll();
+ node.setTemporaryOfflineCause(temporaryOfflineCause);
+ }
+
+ /**
+ * @since TODO
+ * @return If the node is temporarily offline, the reason why.
+ */
+ @SuppressWarnings("unused") // used by setOfflineCause.jelly
+ public String getTemporaryOfflineCauseReason() {
+ var node = getNode();
+ if (node == null) {
+ // Node was deleted; computer still exists
+ return null;
}
- if (temporarilyOffline) {
- Listeners.notify(ComputerListener.class, false, l -> l.onTemporarilyOffline(this, cause));
- } else {
- Listeners.notify(ComputerListener.class, false, l -> l.onTemporarilyOnline(this));
+ var cause = node.getTemporaryOfflineCause();
+ if (cause instanceof OfflineCause.UserCause userCause) {
+ return userCause.getMessage();
}
+ return cause != null ? cause.toString() : "";
}
@Exported
@@ -786,16 +812,6 @@ protected void setNode(Node node) {
this.nodeName = null;
setNumExecutors(node.getNumExecutors());
- if (this.temporarilyOffline) {
- // When we get a new node, push our current temp offline
- // status to it (as the status is not carried across
- // configuration changes that recreate the node).
- // Since this is also called the very first time this
- // Computer is created, avoid pushing an empty status
- // as that could overwrite any status that the Node
- // brought along from its persisted config data.
- node.setTemporaryOfflineCause(this.offlineCause);
- }
}
/**
@@ -1397,24 +1413,23 @@ public void doRssLatest(StaplerRequest2 req, StaplerResponse2 rsp) throws IOExce
@RequirePOST
public HttpResponse doToggleOffline(@QueryParameter String offlineMessage) throws IOException, ServletException {
- if (!temporarilyOffline) {
- checkPermission(DISCONNECT);
- offlineMessage = Util.fixEmptyAndTrim(offlineMessage);
- setTemporarilyOffline(!temporarilyOffline,
- new OfflineCause.UserCause(User.current(), offlineMessage));
- } else {
+ var node = getNode();
+ if (node == null) {
+ return HttpResponses.notFound();
+ }
+ if (node.isTemporarilyOffline()) {
checkPermission(CONNECT);
- setTemporarilyOffline(!temporarilyOffline, null);
+ setTemporaryOfflineCause(null);
+ return HttpResponses.redirectToDot();
+ } else {
+ return doChangeOfflineCause(offlineMessage);
}
- return HttpResponses.redirectToDot();
}
@RequirePOST
public HttpResponse doChangeOfflineCause(@QueryParameter String offlineMessage) throws IOException, ServletException {
checkPermission(DISCONNECT);
- offlineMessage = Util.fixEmptyAndTrim(offlineMessage);
- setTemporarilyOffline(true,
- new OfflineCause.UserCause(User.current(), offlineMessage));
+ setTemporaryOfflineCause(new OfflineCause.UserCause(User.current(), Util.fixEmptyAndTrim(offlineMessage)));
return HttpResponses.redirectToDot();
}
diff --git a/core/src/main/java/hudson/model/Node.java b/core/src/main/java/hudson/model/Node.java
index 55cacd269133..d918b0f1db34 100644
--- a/core/src/main/java/hudson/model/Node.java
+++ b/core/src/main/java/hudson/model/Node.java
@@ -30,7 +30,6 @@
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import hudson.BulkChange;
-import hudson.Extension;
import hudson.ExtensionPoint;
import hudson.FilePath;
import hudson.FileSystemProvisioner;
@@ -69,6 +68,7 @@
import java.util.logging.Logger;
import jenkins.model.Jenkins;
import jenkins.model.Nodes;
+import jenkins.util.Listeners;
import jenkins.util.SystemProperties;
import jenkins.util.io.OnMaster;
import net.sf.json.JSONObject;
@@ -265,24 +265,13 @@ public void onLoad(Nodes parent, String name) {
}
/**
- * Let Nodes be aware of the lifecycle of their own {@link Computer}.
+ * @return true if this node has a temporary offline cause set.
*/
- @Extension
- public static class InternalComputerListener extends ComputerListener {
- @Override
- public void onOnline(Computer c, TaskListener listener) {
- Node node = c.getNode();
-
- // At startup, we need to restore any previously in-effect temp offline cause.
- // We wait until the computer is started rather than getting the data to it sooner
- // so that the normal computer start up processing works as expected.
- if (node != null && node.temporaryOfflineCause != null && node.temporaryOfflineCause != c.getOfflineCause()) {
- c.setTemporarilyOffline(true, node.temporaryOfflineCause);
- }
- }
+ boolean isTemporarilyOffline() {
+ return temporaryOfflineCause != null;
}
- private OfflineCause temporaryOfflineCause;
+ private volatile OfflineCause temporaryOfflineCause;
/**
* Enable a {@link Computer} to inform its node when it is taken
@@ -294,6 +283,11 @@ void setTemporaryOfflineCause(OfflineCause cause) {
temporaryOfflineCause = cause;
save();
}
+ if (temporaryOfflineCause != null) {
+ Listeners.notify(ComputerListener.class, false, l -> l.onTemporarilyOffline(toComputer(), temporaryOfflineCause));
+ } else {
+ Listeners.notify(ComputerListener.class, false, l -> l.onTemporarilyOnline(toComputer()));
+ }
} catch (java.io.IOException e) {
LOGGER.warning("Unable to complete save, temporary offline status will not be persisted: " + e.getMessage());
}
diff --git a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
index 7cd1c75abc8d..d49924508bee 100644
--- a/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
+++ b/core/src/main/java/hudson/node_monitors/AbstractNodeMonitorDescriptor.java
@@ -233,7 +233,7 @@ public boolean isIgnored() {
*/
protected boolean markOnline(Computer c) {
if (isIgnored() || c.isOnline()) return false; // noop
- c.setTemporarilyOffline(false, null);
+ c.setTemporaryOfflineCause(null);
return true;
}
@@ -247,7 +247,7 @@ protected boolean markOnline(Computer c) {
protected boolean markOffline(Computer c, OfflineCause oc) {
if (isIgnored() || c.isTemporarilyOffline()) return false; // noop
- c.setTemporarilyOffline(true, oc);
+ c.setTemporaryOfflineCause(oc);
// notify the admin
MonitorMarkedNodeOffline no = AdministrativeMonitor.all().get(MonitorMarkedNodeOffline.class);
diff --git a/core/src/main/java/hudson/slaves/OfflineCause.java b/core/src/main/java/hudson/slaves/OfflineCause.java
index 556c0ebb0c53..2a267ef03a4a 100644
--- a/core/src/main/java/hudson/slaves/OfflineCause.java
+++ b/core/src/main/java/hudson/slaves/OfflineCause.java
@@ -33,6 +33,8 @@
import java.util.Date;
import jenkins.model.Jenkins;
import org.jvnet.localizer.Localizable;
+import org.kohsuke.accmod.Restricted;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.export.Exported;
import org.kohsuke.stapler.export.ExportedBean;
@@ -71,6 +73,19 @@ public long getTimestamp() {
return new Date(timestamp);
}
+ /**
+ * @deprecated Only exists for backward compatibility.
+ * @see Computer#setTemporarilyOffline(boolean)
+ */
+ @Deprecated
+ @Restricted(NoExternalUse.class)
+ public static class LegacyOfflineCause extends OfflineCause {
+ @Exported(name = "description") @Override
+ public String toString() {
+ return "";
+ }
+ }
+
/**
* {@link OfflineCause} that renders a static text,
* but without any further UI.
@@ -136,15 +151,15 @@ public static class UserCause extends SimpleOfflineCause {
// null when unknown
private /*final*/ @CheckForNull String userId;
+ private final String message;
+
public UserCause(@CheckForNull User user, @CheckForNull String message) {
- this(
- user != null ? user.getId() : null,
- message != null ? " : " + message : ""
- );
+ this(user != null ? user.getId() : null, message);
}
private UserCause(String userId, String message) {
- super(hudson.slaves.Messages._SlaveComputer_DisconnectedBy(userId != null ? userId : Jenkins.ANONYMOUS2.getName(), message));
+ super(hudson.slaves.Messages._SlaveComputer_DisconnectedBy(userId != null ? userId : Jenkins.ANONYMOUS2.getName(), message != null ? " : " + message : ""));
+ this.message = message;
this.userId = userId;
}
@@ -155,6 +170,13 @@ public User getUser() {
;
}
+ /**
+ * @return the message that was provided when the computer was taken offline
+ */
+ public String getMessage() {
+ return message;
+ }
+
// Storing the User in a filed was a mistake, switch to userId
private Object readResolve() throws ObjectStreamException {
if (user != null) {
diff --git a/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly b/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
index 587057a464e1..8bac3c7e27c7 100644
--- a/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
+++ b/core/src/main/resources/hudson/model/Computer/setOfflineCause.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
${%blurb}