Skip to content

Commit 695a930

Browse files
authored
Merge branch 'master' into fix-unsaved-warning-manage-jenkins
2 parents f7b37d9 + 9b6147f commit 695a930

File tree

10 files changed

+109
-162
lines changed

10 files changed

+109
-162
lines changed

.github/FUNDING.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

.github/workflows/announce-lts-rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
discourse-author-username: jenkins-release-bot
1818
discourse-category: 23
1919
- name: Post on mailing list
20-
uses: dawidd6/action-send-mail@62a2d05b79935ad4fb90ce9079928099579c14ac # v9
20+
uses: dawidd6/action-send-mail@ba302ba66e88942841281c984a6b31ca6d6289e6 # v11
2121
with:
2222
server_address: smtp.gmail.com
2323
server_port: 465

ath.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -o xtrace
66
cd "$(dirname "$0")"
77

88
# https://github.com/jenkinsci/acceptance-test-harness/releases
9-
export ATH_VERSION=6584.v099cc7d646fc
9+
export ATH_VERSION=6587.v2a_7493c89346
1010

1111
if [[ $# -eq 0 ]]; then
1212
export JDK=21

core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ THE SOFTWARE.
3232
<j:set var="queuedItems" value="${it.queueItems}"/>
3333
<j:if test="${!queuedItems.isEmpty()}">
3434
<span class="app-builds-container__heading">${%Pending}</span>
35-
<j:forEach var="pageEntry" items="${queuedItems}">
35+
<j:forEach var="pageEntry" items="${queuedItems}" indexVar="i">
3636
<j:set var="item" value="${pageEntry.entry}"/>
3737
<j:set var="id" value="${h.generateId()}"/>
3838

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"clean-webpack-plugin": "4.0.0",
3232
"css-loader": "7.1.4",
3333
"css-minimizer-webpack-plugin": "7.0.4",
34-
"eslint": "10.0.1",
34+
"eslint": "10.0.2",
3535
"eslint-config-prettier": "10.1.8",
3636
"eslint-formatter-checkstyle": "9.0.1",
3737
"globals": "17.3.0",
@@ -45,10 +45,10 @@
4545
"sass": "1.97.3",
4646
"sass-loader": "16.0.7",
4747
"style-loader": "4.0.0",
48-
"stylelint": "17.3.0",
48+
"stylelint": "17.4.0",
4949
"stylelint-checkstyle-reporter": "1.1.1",
5050
"stylelint-config-standard-scss": "17.0.0",
51-
"webpack": "5.105.2",
51+
"webpack": "5.105.3",
5252
"webpack-cli": "6.0.1",
5353
"webpack-remove-empty-scripts": "1.1.1"
5454
},

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ THE SOFTWARE.
7373
</issueManagement>
7474

7575
<properties>
76-
<revision>2.552</revision>
76+
<revision>2.553</revision>
7777
<changelist>-SNAPSHOT</changelist>
78-
<project.build.outputTimestamp>2026-02-16T15:39:55Z</project.build.outputTimestamp>
78+
<project.build.outputTimestamp>2026-02-24T06:43:50Z</project.build.outputTimestamp>
7979

8080
<!-- configuration for patch tracker plugin -->
8181
<project.patchManagement.system>github</project.patchManagement.system>
@@ -99,7 +99,7 @@ THE SOFTWARE.
9999
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
100100
<!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
101101
<winstone.version>8.1033.v23d2f156e821</winstone.version>
102-
<node.version>24.13.1</node.version>
102+
<node.version>24.14.0</node.version>
103103
</properties>
104104

105105
<!--

test/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ THE SOFTWARE.
7878
<!-- RequireUpperBoundDeps between checks-api, plugin-util-api, and font-awesome-api -->
7979
<groupId>io.jenkins.plugins</groupId>
8080
<artifactId>commons-text-api</artifactId>
81-
<version>1.15.0-210.v7480a_da_70b_9e</version>
81+
<version>1.15.0-218.va_61573470393</version>
8282
</dependency>
8383
<dependency>
8484
<!-- RequireUpperBoundDeps between bootstrap5-api and echarts-api -->
@@ -109,7 +109,7 @@ THE SOFTWARE.
109109
<dependency>
110110
<groupId>org.jenkins-ci.plugins</groupId>
111111
<artifactId>bouncycastle-api</artifactId>
112-
<version>2.30.1.82-277.v70ca_0b_877184</version>
112+
<version>2.30.1.83-289.v8426fcd19371</version>
113113
</dependency>
114114
<dependency>
115115
<!-- RequireUpperBoundDeps via mailer and junit -->
@@ -238,7 +238,7 @@ THE SOFTWARE.
238238
<dependency>
239239
<groupId>org.jenkins-ci.plugins</groupId>
240240
<artifactId>credentials</artifactId>
241-
<version>1490.ve7532596f1fd</version>
241+
<version>1491.v6d6145e96e1c</version>
242242
<scope>test</scope>
243243
</dependency>
244244
<dependency>

test/src/test/java/jenkins/install/SetupWizardTest.java

Lines changed: 58 additions & 100 deletions
Large diffs are not rendered by default.

war/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ THE SOFTWARE.
450450
<!-- detached after 2.16 -->
451451
<groupId>org.jenkins-ci.plugins</groupId>
452452
<artifactId>bouncycastle-api</artifactId>
453-
<version>2.30.1.82-277.v70ca_0b_877184</version>
453+
<version>2.30.1.83-289.v8426fcd19371</version>
454454
<type>hpi</type>
455455
</artifactItem>
456456
<artifactItem>
@@ -534,7 +534,7 @@ THE SOFTWARE.
534534
<!-- dependency of bootstrap5-api, checks-api, echarts-api, font-awesome-api, jquery3-api, and plugin-util-api -->
535535
<groupId>io.jenkins.plugins</groupId>
536536
<artifactId>commons-text-api</artifactId>
537-
<version>1.15.0-210.v7480a_da_70b_9e</version>
537+
<version>1.15.0-218.va_61573470393</version>
538538
<type>hpi</type>
539539
</artifactItem>
540540
<artifactItem>

yarn.lock

Lines changed: 37 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,10 +1201,10 @@ __metadata:
12011201
languageName: node
12021202
linkType: hard
12031203

1204-
"@csstools/css-syntax-patches-for-csstree@npm:^1.0.26":
1205-
version: 1.0.27
1206-
resolution: "@csstools/css-syntax-patches-for-csstree@npm:1.0.27"
1207-
checksum: 10c0/ef3f2a639109758c0f3c04520465800ca4c830174bd6f7979795083877c82ace51ab8353857b06a818cb6c0de6d4dc88f84a86fc3b021be47f11a0f1c4b74e7e
1204+
"@csstools/css-syntax-patches-for-csstree@npm:^1.0.27":
1205+
version: 1.0.28
1206+
resolution: "@csstools/css-syntax-patches-for-csstree@npm:1.0.28"
1207+
checksum: 10c0/d3334499545a4d7abdd7b18364c055aec22f66323828af9b87a9adb43153e0e12319876c5ab128b972605f21da60cb05857f4d143eac9ddffe51c33f3dfb7fff
12081208
languageName: node
12091209
linkType: hard
12101210

@@ -2637,7 +2637,7 @@ __metadata:
26372637
languageName: node
26382638
linkType: hard
26392639

2640-
"acorn@npm:^8.15.0, acorn@npm:^8.16.0, acorn@npm:^8.8.2":
2640+
"acorn@npm:^8.16.0, acorn@npm:^8.8.2":
26412641
version: 8.16.0
26422642
resolution: "acorn@npm:8.16.0"
26432643
bin:
@@ -2678,15 +2678,15 @@ __metadata:
26782678
languageName: node
26792679
linkType: hard
26802680

2681-
"ajv@npm:^6.12.4":
2682-
version: 6.12.6
2683-
resolution: "ajv@npm:6.12.6"
2681+
"ajv@npm:^6.14.0":
2682+
version: 6.14.0
2683+
resolution: "ajv@npm:6.14.0"
26842684
dependencies:
26852685
fast-deep-equal: "npm:^3.1.1"
26862686
fast-json-stable-stringify: "npm:^2.0.0"
26872687
json-schema-traverse: "npm:^0.4.1"
26882688
uri-js: "npm:^4.2.2"
2689-
checksum: 10c0/41e23642cbe545889245b9d2a45854ebba51cda6c778ebced9649420d9205f2efb39cb43dbc41e358409223b1ea43303ae4839db682c848b891e4811da1a5a71
2689+
checksum: 10c0/a2bc39b0555dc9802c899f86990eb8eed6e366cddbf65be43d5aa7e4f3c4e1a199d5460fd7ca4fb3d864000dbbc049253b72faa83b3b30e641ca52cb29a68c22
26902690
languageName: node
26912691
linkType: hard
26922692

@@ -2867,13 +2867,6 @@ __metadata:
28672867
languageName: node
28682868
linkType: hard
28692869

2870-
"balanced-match@npm:^3.0.1":
2871-
version: 3.0.1
2872-
resolution: "balanced-match@npm:3.0.1"
2873-
checksum: 10c0/ac8dd63a5b260610c2cbda982f436e964c1b9ae8764d368a523769da40a31710abd6e19f0fdf1773c4ad7b2ea7ba7b285d547375dc723f6e754369835afc8e9f
2874-
languageName: node
2875-
linkType: hard
2876-
28772870
"balanced-match@npm:^4.0.2":
28782871
version: 4.0.3
28792872
resolution: "balanced-match@npm:4.0.3"
@@ -3239,10 +3232,10 @@ __metadata:
32393232
languageName: node
32403233
linkType: hard
32413234

3242-
"css-functions-list@npm:^3.2.3":
3243-
version: 3.2.3
3244-
resolution: "css-functions-list@npm:3.2.3"
3245-
checksum: 10c0/03f9ed34eeed310d2b1cf0e524eea02bc5f87854a4de85f8957ea432ab1036841a3fb00879590519f7bb8fda40d992ce7a72fa9b61696ca1dc53b90064858f96
3235+
"css-functions-list@npm:^3.3.3":
3236+
version: 3.3.3
3237+
resolution: "css-functions-list@npm:3.3.3"
3238+
checksum: 10c0/7b9e5dd94e0178b2edb0f3263de5ae7942e56ab0b73420d4adb8fea003367e1dbc94fe8ea300bf732d1423f7eafb523e695136f0a4e6ae4f0abec66848219ee6
32463239
languageName: node
32473240
linkType: hard
32483241

@@ -3706,9 +3699,9 @@ __metadata:
37063699
languageName: node
37073700
linkType: hard
37083701

3709-
"eslint@npm:10.0.1":
3710-
version: 10.0.1
3711-
resolution: "eslint@npm:10.0.1"
3702+
"eslint@npm:10.0.2":
3703+
version: 10.0.2
3704+
resolution: "eslint@npm:10.0.2"
37123705
dependencies:
37133706
"@eslint-community/eslint-utils": "npm:^4.8.0"
37143707
"@eslint-community/regexpp": "npm:^4.12.2"
@@ -3720,7 +3713,7 @@ __metadata:
37203713
"@humanwhocodes/module-importer": "npm:^1.0.1"
37213714
"@humanwhocodes/retry": "npm:^0.4.2"
37223715
"@types/estree": "npm:^1.0.6"
3723-
ajv: "npm:^6.12.4"
3716+
ajv: "npm:^6.14.0"
37243717
cross-spawn: "npm:^7.0.6"
37253718
debug: "npm:^4.3.2"
37263719
escape-string-regexp: "npm:^4.0.0"
@@ -3747,7 +3740,7 @@ __metadata:
37473740
optional: true
37483741
bin:
37493742
eslint: bin/eslint.js
3750-
checksum: 10c0/760de87b6ed9cd7a9b13eb68872ff057eb6d88e63ec818e297decdb2814ba80879ad0dfabb943dabaf486b5eaf6f15d446bf42116adeb88364337202db11c449
3743+
checksum: 10c0/ed1aa142a1fa9c82fb30f0ee5b257d8e7655b601d2480ba29454184f7e2ea4b29c83adef1ac1e0f7a194fbd8b8f994e20f73e2c96bad8cb150d012425cdc3236
37513744
languageName: node
37523745
linkType: hard
37533746

@@ -4560,7 +4553,7 @@ __metadata:
45604553
clean-webpack-plugin: "npm:4.0.0"
45614554
css-loader: "npm:7.1.4"
45624555
css-minimizer-webpack-plugin: "npm:7.0.4"
4563-
eslint: "npm:10.0.1"
4556+
eslint: "npm:10.0.2"
45644557
eslint-config-prettier: "npm:10.1.8"
45654558
eslint-formatter-checkstyle: "npm:9.0.1"
45664559
globals: "npm:17.3.0"
@@ -4579,11 +4572,11 @@ __metadata:
45794572
sass-loader: "npm:16.0.7"
45804573
sortablejs: "npm:1.15.7"
45814574
style-loader: "npm:4.0.0"
4582-
stylelint: "npm:17.3.0"
4575+
stylelint: "npm:17.4.0"
45834576
stylelint-checkstyle-reporter: "npm:1.1.1"
45844577
stylelint-config-standard-scss: "npm:17.0.0"
45854578
tippy.js: "npm:6.3.7"
4586-
webpack: "npm:5.105.2"
4579+
webpack: "npm:5.105.3"
45874580
webpack-cli: "npm:6.0.1"
45884581
webpack-remove-empty-scripts: "npm:1.1.1"
45894582
window-handle: "npm:1.0.1"
@@ -6888,21 +6881,20 @@ __metadata:
68886881
languageName: node
68896882
linkType: hard
68906883

6891-
"stylelint@npm:17.3.0":
6892-
version: 17.3.0
6893-
resolution: "stylelint@npm:17.3.0"
6884+
"stylelint@npm:17.4.0":
6885+
version: 17.4.0
6886+
resolution: "stylelint@npm:17.4.0"
68946887
dependencies:
68956888
"@csstools/css-calc": "npm:^3.1.1"
68966889
"@csstools/css-parser-algorithms": "npm:^4.0.0"
6897-
"@csstools/css-syntax-patches-for-csstree": "npm:^1.0.26"
6890+
"@csstools/css-syntax-patches-for-csstree": "npm:^1.0.27"
68986891
"@csstools/css-tokenizer": "npm:^4.0.0"
68996892
"@csstools/media-query-list-parser": "npm:^5.0.0"
69006893
"@csstools/selector-resolve-nested": "npm:^4.0.0"
69016894
"@csstools/selector-specificity": "npm:^6.0.0"
6902-
balanced-match: "npm:^3.0.1"
69036895
colord: "npm:^2.9.3"
69046896
cosmiconfig: "npm:^9.0.0"
6905-
css-functions-list: "npm:^3.2.3"
6897+
css-functions-list: "npm:^3.3.3"
69066898
css-tree: "npm:^3.1.0"
69076899
debug: "npm:^4.4.3"
69086900
fast-glob: "npm:^3.3.3"
@@ -6916,7 +6908,6 @@ __metadata:
69166908
import-meta-resolve: "npm:^4.2.0"
69176909
imurmurhash: "npm:^0.1.4"
69186910
is-plain-object: "npm:^5.0.0"
6919-
known-css-properties: "npm:^0.37.0"
69206911
mathml-tag-names: "npm:^4.0.0"
69216912
meow: "npm:^14.0.0"
69226913
micromatch: "npm:^4.0.8"
@@ -6933,7 +6924,7 @@ __metadata:
69336924
write-file-atomic: "npm:^7.0.0"
69346925
bin:
69356926
stylelint: bin/stylelint.mjs
6936-
checksum: 10c0/94d136e4fe29bdf269613706fe19cfe0872de9c7d63c38c42d463be9ccec349b64a3a94539be73bc243a8e3ebdb20ca208b642725cfa7ba2e315dc2656575d51
6927+
checksum: 10c0/ccda036ae73e4e2d711d1c54e76ce01d991fc13607323f0d31c06828e135ec33ac65ba13f0b83956f9837da73d71f42d1e6148678e8f1c077b98cfbec0821800
69376928
languageName: node
69386929
linkType: hard
69396930

@@ -7263,24 +7254,24 @@ __metadata:
72637254
languageName: node
72647255
linkType: hard
72657256

7266-
"webpack-sources@npm:^3.3.3":
7267-
version: 3.3.3
7268-
resolution: "webpack-sources@npm:3.3.3"
7269-
checksum: 10c0/ab732f6933b513ba4d505130418995ddef6df988421fccf3289e53583c6a39e205c4a0739cee98950964552d3006604912679c736031337fb4a9d78d8576ed40
7257+
"webpack-sources@npm:^3.3.4":
7258+
version: 3.3.4
7259+
resolution: "webpack-sources@npm:3.3.4"
7260+
checksum: 10c0/94a42508531338eb41939cf1d48a4a8a6db97f3a47e5453cff2133a68d3169ca779d4bcbe9dfed072ce16611959eba1e16f085bc2dc56714e1a1c1783fd661a3
72707261
languageName: node
72717262
linkType: hard
72727263

7273-
"webpack@npm:5.105.2":
7274-
version: 5.105.2
7275-
resolution: "webpack@npm:5.105.2"
7264+
"webpack@npm:5.105.3":
7265+
version: 5.105.3
7266+
resolution: "webpack@npm:5.105.3"
72767267
dependencies:
72777268
"@types/eslint-scope": "npm:^3.7.7"
72787269
"@types/estree": "npm:^1.0.8"
72797270
"@types/json-schema": "npm:^7.0.15"
72807271
"@webassemblyjs/ast": "npm:^1.14.1"
72817272
"@webassemblyjs/wasm-edit": "npm:^1.14.1"
72827273
"@webassemblyjs/wasm-parser": "npm:^1.14.1"
7283-
acorn: "npm:^8.15.0"
7274+
acorn: "npm:^8.16.0"
72847275
acorn-import-phases: "npm:^1.0.3"
72857276
browserslist: "npm:^4.28.1"
72867277
chrome-trace-event: "npm:^1.0.2"
@@ -7298,13 +7289,13 @@ __metadata:
72987289
tapable: "npm:^2.3.0"
72997290
terser-webpack-plugin: "npm:^5.3.16"
73007291
watchpack: "npm:^2.5.1"
7301-
webpack-sources: "npm:^3.3.3"
7292+
webpack-sources: "npm:^3.3.4"
73027293
peerDependenciesMeta:
73037294
webpack-cli:
73047295
optional: true
73057296
bin:
73067297
webpack: bin/webpack.js
7307-
checksum: 10c0/565df8072c00d72e0a22e136971862b7eac7beb8b8d39a2ae4ab00838941ea58acc5b49dd7ea268e3d839810756cb86ba5c272b3a25904f6db7807cfa8ed0b29
7298+
checksum: 10c0/a9a9a3a369d14f24348bd932feb07eef74a9fe194ad16704dc4f125b6055fe51a5ef1c6fdb3aa398c6f180f59aa14cb1b360695d8ea862a5ed130103ebd255e0
73087299
languageName: node
73097300
linkType: hard
73107301

0 commit comments

Comments
 (0)