Skip to content

Commit 474c603

Browse files
Merge branch 'master' into JENKINS-75944-clarify-requirepost-warning
2 parents d866399 + 4fdc1b3 commit 474c603

7 files changed

Lines changed: 33 additions & 17 deletions

File tree

.github/workflows/require-changelog-label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
issues: write
1313
pull-requests: write
1414
steps:
15-
- uses: mheap/github-action-required-labels@0ac283b4e65c1fb28ce6079dea5546ceca98ccbe # v5.5.2
15+
- uses: mheap/github-action-required-labels@23e10fde7e062233401931a0eece796cd9bf3177 # v5.6.0
1616
with:
1717
mode: minimum
1818
count: 1

bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ THE SOFTWARE.
4141
<commons-fileupload2.version>2.0.0-M5</commons-fileupload2.version>
4242
<groovy.version>2.4.21</groovy.version>
4343
<jelly.version>1.1-jenkins-20260418</jelly.version>
44-
<stapler.version>2092.v91b_2c63e0c97</stapler.version>
44+
<stapler.version>2098.vb_b_6e4c15415b_</stapler.version>
4545
</properties>
4646

4747
<dependencyManagement>

core/src/main/resources/hudson/triggers/SCMTrigger/help.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,20 @@
1010
this document
1111
</a>
1212
</p>
13+
14+
<p>
15+
The schedule is evaluated in the time zone of the Jenkins controller by
16+
default. To use a different time zone, specify it on the first line of the
17+
schedule field using
18+
<code>TZ=</code>
19+
followed by a time zone ID, for example:
20+
</p>
21+
<pre>
22+
TZ=Europe/London
23+
H/15 * * * *
24+
</pre>
25+
<p>
26+
See the help for the "Build periodically" trigger for the full schedule
27+
syntax and the list of supported time zone IDs.
28+
</p>
1329
</div>

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
"stylelint": "17.14.0",
4949
"stylelint-checkstyle-reporter": "1.1.1",
5050
"stylelint-config-standard-scss": "17.0.0",
51-
"webpack": "5.108.3",
52-
"webpack-cli": "7.1.0",
51+
"webpack": "5.108.4",
52+
"webpack-cli": "7.2.1",
5353
"webpack-remove-empty-scripts": "1.1.1"
5454
},
5555
"dependencies": {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ THE SOFTWARE.
9898
<spotless.check.skip>false</spotless.check.skip>
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: -->
101-
<winstone.version>8.1041.v055ce9e062e3</winstone.version>
101+
<winstone.version>8.1044.v8e30078854c2</winstone.version>
102102
<node.version>24.18.0</node.version>
103103
</properties>
104104

war/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ THE SOFTWARE.
701701
contains a version of Jetty that is older than this, trigger Dependabot in jenkinsci/winstone and release the
702702
result before proceeding with the update here.
703703
-->
704-
<version>12.1.10</version>
704+
<version>12.1.11</version>
705705
<configuration>
706706
<!--
707707
Reload webapp when you hit ENTER. (See JETTY-282 for more)

yarn.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4302,8 +4302,8 @@ __metadata:
43024302
stylelint-checkstyle-reporter: "npm:1.1.1"
43034303
stylelint-config-standard-scss: "npm:17.0.0"
43044304
tippy.js: "npm:6.3.7"
4305-
webpack: "npm:5.108.3"
4306-
webpack-cli: "npm:7.1.0"
4305+
webpack: "npm:5.108.4"
4306+
webpack-cli: "npm:7.2.1"
43074307
webpack-remove-empty-scripts: "npm:1.1.1"
43084308
window-handle: "npm:1.0.1"
43094309
languageName: unknown
@@ -6676,9 +6676,9 @@ __metadata:
66766676
languageName: node
66776677
linkType: hard
66786678

6679-
"webpack-cli@npm:7.1.0":
6680-
version: 7.1.0
6681-
resolution: "webpack-cli@npm:7.1.0"
6679+
"webpack-cli@npm:7.2.1":
6680+
version: 7.2.1
6681+
resolution: "webpack-cli@npm:7.2.1"
66826682
dependencies:
66836683
"@discoveryjs/json-ext": "npm:^1.1.0"
66846684
commander: "npm:^14.0.3"
@@ -6694,7 +6694,7 @@ __metadata:
66946694
toml: ^3.0.0 || ^4.0.0
66956695
webpack: ^5.101.0
66966696
webpack-bundle-analyzer: ^4.0.0 || ^5.0.0
6697-
webpack-dev-server: ^5.0.0
6697+
webpack-dev-server: ^5.0.0 || ^6.0.0
66986698
peerDependenciesMeta:
66996699
js-yaml:
67006700
optional: true
@@ -6708,7 +6708,7 @@ __metadata:
67086708
optional: true
67096709
bin:
67106710
webpack-cli: bin/cli.js
6711-
checksum: 10c0/3a6bf763334a965957b4e40fa76739088e08f006078f25b12151f84950559f62a772acd37faf5bf29b1847907e088050e1f7e7c682f51689f83fbfa951d12786
6711+
checksum: 10c0/52097d4c7f11b05f1328ea96ea464951a5723fb9ebb4c83f3e2a0510930cbc2a0ff1956be2e08ec0a0723a6b633eb9af22f4722a9ffee69ca7676da1c4237838
67126712
languageName: node
67136713
linkType: hard
67146714

@@ -6741,9 +6741,9 @@ __metadata:
67416741
languageName: node
67426742
linkType: hard
67436743

6744-
"webpack@npm:5.108.3":
6745-
version: 5.108.3
6746-
resolution: "webpack@npm:5.108.3"
6744+
"webpack@npm:5.108.4":
6745+
version: 5.108.4
6746+
resolution: "webpack@npm:5.108.4"
67476747
dependencies:
67486748
"@types/estree": "npm:^1.0.8"
67496749
"@types/json-schema": "npm:^7.0.15"
@@ -6772,7 +6772,7 @@ __metadata:
67726772
optional: true
67736773
bin:
67746774
webpack: bin/webpack.js
6775-
checksum: 10c0/96a0e17e5443ed179be24ee91fe2d5aca25aad8cf61e3ea469219b1fe9f970642ae40e0f32ad84888e8867c7141e2b8b2eaf32c290edce2e93762482231b7dad
6775+
checksum: 10c0/842a8628822f3cb82c2b0ff9c4242ba05c0dae1f306248c87dfb543bb56b86b047b5f08efff0d5c56067bfc6b245a2f4f8ad32923bee8c303d29c43172467e38
67766776
languageName: node
67776777
linkType: hard
67786778

0 commit comments

Comments
 (0)