Skip to content

Commit 1d9d563

Browse files
authored
Merge branch 'master' into master
2 parents e6a4130 + 66ee5c2 commit 1d9d563

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

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=6361.vcb_036a_7ffb_a_5
9+
export ATH_VERSION=6388.v40780b_42e87e
1010

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

core/src/main/java/hudson/console/AnnotatedLargeText.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ public AnnotatedLargeText(ByteBuffer memory, Charset charset, boolean completed,
9494
this.context = context;
9595
}
9696

97+
public AnnotatedLargeText(LargeText.Source source, Charset charset, boolean completed, T context) {
98+
super(source, charset, completed);
99+
this.context = context;
100+
}
101+
97102
/**
98103
* @since 2.475
99104
*/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"stylelint": "16.25.0",
4949
"stylelint-checkstyle-reporter": "1.1.1",
5050
"stylelint-config-standard-scss": "16.0.0",
51-
"webpack": "5.102.0",
51+
"webpack": "5.102.1",
5252
"webpack-cli": "6.0.1",
5353
"webpack-remove-empty-scripts": "1.1.1"
5454
},

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.15</winstone.version>
102-
<node.version>24.10.0</node.version>
102+
<node.version>24.9.0</node.version>
103103
</properties>
104104

105105
<!--

yarn.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,7 +2819,7 @@ __metadata:
28192819
languageName: node
28202820
linkType: hard
28212821

2822-
"browserslist@npm:^4.0.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0, browserslist@npm:^4.24.4, browserslist@npm:^4.24.5, browserslist@npm:^4.25.0, browserslist@npm:^4.26.0":
2822+
"browserslist@npm:^4.0.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0, browserslist@npm:^4.24.4, browserslist@npm:^4.25.0, browserslist@npm:^4.26.0, browserslist@npm:^4.26.3":
28232823
version: 4.26.3
28242824
resolution: "browserslist@npm:4.26.3"
28252825
dependencies:
@@ -4433,7 +4433,7 @@ __metadata:
44334433
stylelint-checkstyle-reporter: "npm:1.1.1"
44344434
stylelint-config-standard-scss: "npm:16.0.0"
44354435
tippy.js: "npm:6.3.7"
4436-
webpack: "npm:5.102.0"
4436+
webpack: "npm:5.102.1"
44374437
webpack-cli: "npm:6.0.1"
44384438
webpack-remove-empty-scripts: "npm:1.1.1"
44394439
window-handle: "npm:1.0.1"
@@ -6416,15 +6416,15 @@ __metadata:
64166416
languageName: node
64176417
linkType: hard
64186418

6419-
"schema-utils@npm:^4.0.0, schema-utils@npm:^4.2.0, schema-utils@npm:^4.3.0, schema-utils@npm:^4.3.2":
6420-
version: 4.3.2
6421-
resolution: "schema-utils@npm:4.3.2"
6419+
"schema-utils@npm:^4.0.0, schema-utils@npm:^4.2.0, schema-utils@npm:^4.3.0, schema-utils@npm:^4.3.3":
6420+
version: 4.3.3
6421+
resolution: "schema-utils@npm:4.3.3"
64226422
dependencies:
64236423
"@types/json-schema": "npm:^7.0.9"
64246424
ajv: "npm:^8.9.0"
64256425
ajv-formats: "npm:^2.1.1"
64266426
ajv-keywords: "npm:^5.1.0"
6427-
checksum: 10c0/981632f9bf59f35b15a9bcdac671dd183f4946fe4b055ae71a301e66a9797b95e5dd450de581eb6cca56fb6583ce8f24d67b2d9f8e1b2936612209697f6c277e
6427+
checksum: 10c0/1c8d2c480a026d7c02ab2ecbe5919133a096d6a721a3f201fa50663e4f30f6d6ba020dfddd93cb828b66b922e76b342e103edd19a62c95c8f60e9079cc403202
64286428
languageName: node
64296429
linkType: hard
64306430

@@ -6874,7 +6874,7 @@ __metadata:
68746874
languageName: node
68756875
linkType: hard
68766876

6877-
"tapable@npm:^2.2.0, tapable@npm:^2.2.1, tapable@npm:^2.2.3":
6877+
"tapable@npm:^2.2.0, tapable@npm:^2.2.1, tapable@npm:^2.3.0":
68786878
version: 2.3.0
68796879
resolution: "tapable@npm:2.3.0"
68806880
checksum: 10c0/cb9d67cc2c6a74dedc812ef3085d9d681edd2c1fa18e4aef57a3c0605fdbe44e6b8ea00bd9ef21bc74dd45314e39d31227aa031ebf2f5e38164df514136f2681
@@ -7122,9 +7122,9 @@ __metadata:
71227122
languageName: node
71237123
linkType: hard
71247124

7125-
"webpack@npm:5.102.0":
7126-
version: 5.102.0
7127-
resolution: "webpack@npm:5.102.0"
7125+
"webpack@npm:5.102.1":
7126+
version: 5.102.1
7127+
resolution: "webpack@npm:5.102.1"
71287128
dependencies:
71297129
"@types/eslint-scope": "npm:^3.7.7"
71307130
"@types/estree": "npm:^1.0.8"
@@ -7134,7 +7134,7 @@ __metadata:
71347134
"@webassemblyjs/wasm-parser": "npm:^1.14.1"
71357135
acorn: "npm:^8.15.0"
71367136
acorn-import-phases: "npm:^1.0.3"
7137-
browserslist: "npm:^4.24.5"
7137+
browserslist: "npm:^4.26.3"
71387138
chrome-trace-event: "npm:^1.0.2"
71397139
enhanced-resolve: "npm:^5.17.3"
71407140
es-module-lexer: "npm:^1.2.1"
@@ -7146,8 +7146,8 @@ __metadata:
71467146
loader-runner: "npm:^4.2.0"
71477147
mime-types: "npm:^2.1.27"
71487148
neo-async: "npm:^2.6.2"
7149-
schema-utils: "npm:^4.3.2"
7150-
tapable: "npm:^2.2.3"
7149+
schema-utils: "npm:^4.3.3"
7150+
tapable: "npm:^2.3.0"
71517151
terser-webpack-plugin: "npm:^5.3.11"
71527152
watchpack: "npm:^2.4.4"
71537153
webpack-sources: "npm:^3.3.3"
@@ -7156,7 +7156,7 @@ __metadata:
71567156
optional: true
71577157
bin:
71587158
webpack: bin/webpack.js
7159-
checksum: 10c0/da8f18a5a4b2284d8f3bae0639cd46798d9b0949c48908680b5798125e57fa4898e80155cc367c9758d444d1251df57b2c76fd6c0988dd95ffc89df3bb712f89
7159+
checksum: 10c0/74c3afeef50a5414e58399f1c0123fe5cdb3d8d081c206fae74b8334097d5ff6b729147154dbb4af48e662ba756a89e06d550b3390917153fa1d7ce285f96777
71607160
languageName: node
71617161
linkType: hard
71627162

0 commit comments

Comments
 (0)