Skip to content

Commit eedb91b

Browse files
Merge branch 'master' into issue-26003
2 parents 09fec53 + da99a73 commit eedb91b

File tree

7 files changed

+55
-38
lines changed

7 files changed

+55
-38
lines changed

core/src/main/java/hudson/PluginWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public void setOptionalDependents(@NonNull Set<String> optionalDependents) {
253253
*/
254254
@Deprecated
255255
public void setOptionalDependants(@NonNull Set<String> optionalDependents) {
256-
setOptionalDependents(dependents);
256+
setOptionalDependents(optionalDependents);
257257
}
258258

259259
/**

core/src/main/java/hudson/model/StreamBuildListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public StreamBuildListener(File out, Charset charset) throws IOException {
4848
}
4949

5050
/**
51-
* @deprecated as of TODO
51+
* @deprecated as of 2.329
5252
* The caller should use {@link #StreamBuildListener(OutputStream, Charset)} to pass in
5353
* the charset and output stream separately, so that this class can handle encoding correctly.
5454
*/

core/src/main/java/hudson/slaves/JNLPLauncher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void launch(SlaveComputer computer, TaskListener listener) {
185185
}
186186

187187
/**
188-
* @deprecated as of 1.XXX
188+
* @deprecated as of 2.2
189189
* Use {@link Jenkins#getDescriptor(Class)}
190190
*/
191191
@Deprecated

core/src/main/java/hudson/util/StreamTaskListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public StreamTaskListener(@NonNull PrintStream out) {
7474
}
7575

7676
/**
77-
* @deprecated as of TODO
77+
* @deprecated as of 2.328
7878
* The caller should use {@link #StreamTaskListener(OutputStream, Charset)} to pass in
7979
* the charset and output stream separately, so that this class can handle encoding correctly,
8080
* or use {@link #fromStdout()} or {@link #fromStderr()}.
@@ -94,7 +94,7 @@ public StreamTaskListener(@NonNull OutputStream out, @CheckForNull Charset chars
9494
}
9595

9696
/**
97-
* @deprecated as of TODO
97+
* @deprecated as of 2.329
9898
* The caller should use {@link #StreamTaskListener(File, Charset)} to pass in
9999
* the charset and file separately, so that this class can handle encoding correctly.
100100
*/

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"mini-css-extract-plugin": "2.9.4",
4040
"postcss": "8.5.6",
4141
"postcss-loader": "8.2.0",
42-
"postcss-preset-env": "10.5.0",
42+
"postcss-preset-env": "10.6.0",
4343
"postcss-scss": "4.0.9",
4444
"prettier": "3.7.4",
4545
"sass": "1.97.1",

test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ THE SOFTWARE.
192192
<dependency>
193193
<groupId>org.jenkins-ci.main</groupId>
194194
<artifactId>jenkins-test-harness</artifactId>
195-
<version>2538.vcca_5b_74c18a_2</version>
195+
<version>2541.v6e1dd03c77b_b_</version>
196196
<scope>test</scope>
197197
<exclusions>
198198
<exclusion>

yarn.lock

Lines changed: 48 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,6 +1592,18 @@ __metadata:
15921592
languageName: node
15931593
linkType: hard
15941594

1595+
"@csstools/postcss-property-rule-prelude-list@npm:^1.0.0":
1596+
version: 1.0.0
1597+
resolution: "@csstools/postcss-property-rule-prelude-list@npm:1.0.0"
1598+
dependencies:
1599+
"@csstools/css-parser-algorithms": "npm:^3.0.5"
1600+
"@csstools/css-tokenizer": "npm:^3.0.4"
1601+
peerDependencies:
1602+
postcss: ^8.4
1603+
checksum: 10c0/ae8bbca3a77ca59c21c11899a904f9d9417a19a3359d01dee042e0489b7ddfe7cea13ae275b7e7936d9b0b99c0a13f7f685f962cd63ca3d3d2b6e5eacc293a0d
1604+
languageName: node
1605+
linkType: hard
1606+
15951607
"@csstools/postcss-random-function@npm:^2.0.1":
15961608
version: 2.0.1
15971609
resolution: "@csstools/postcss-random-function@npm:2.0.1"
@@ -1657,6 +1669,17 @@ __metadata:
16571669
languageName: node
16581670
linkType: hard
16591671

1672+
"@csstools/postcss-syntax-descriptor-syntax-production@npm:^1.0.1":
1673+
version: 1.0.1
1674+
resolution: "@csstools/postcss-syntax-descriptor-syntax-production@npm:1.0.1"
1675+
dependencies:
1676+
"@csstools/css-tokenizer": "npm:^3.0.4"
1677+
peerDependencies:
1678+
postcss: ^8.4
1679+
checksum: 10c0/b9b3d84a50b86b1af1b8b7e56a64d5eebc1c89c323a5263306c5c69ddb05a4d468d7072a7786b0ea6601629035df0089565e9d98d55d0f4eb7201cf7ed1bb3e9
1680+
languageName: node
1681+
linkType: hard
1682+
16601683
"@csstools/postcss-system-ui-font-family@npm:^1.0.0":
16611684
version: 1.0.0
16621685
resolution: "@csstools/postcss-system-ui-font-family@npm:1.0.0"
@@ -2761,21 +2784,20 @@ __metadata:
27612784
languageName: node
27622785
linkType: hard
27632786

2764-
"autoprefixer@npm:^10.4.22":
2765-
version: 10.4.22
2766-
resolution: "autoprefixer@npm:10.4.22"
2787+
"autoprefixer@npm:^10.4.23":
2788+
version: 10.4.23
2789+
resolution: "autoprefixer@npm:10.4.23"
27672790
dependencies:
2768-
browserslist: "npm:^4.27.0"
2769-
caniuse-lite: "npm:^1.0.30001754"
2791+
browserslist: "npm:^4.28.1"
2792+
caniuse-lite: "npm:^1.0.30001760"
27702793
fraction.js: "npm:^5.3.4"
2771-
normalize-range: "npm:^0.1.2"
27722794
picocolors: "npm:^1.1.1"
27732795
postcss-value-parser: "npm:^4.2.0"
27742796
peerDependencies:
27752797
postcss: ^8.1.0
27762798
bin:
27772799
autoprefixer: bin/autoprefixer
2778-
checksum: 10c0/2ae8d135af2deaaa5065a3a466c877787373c0ed766b8a8e8259d7871db79c1a7e1d9f6c9541c54fa95647511d3c2066bb08a30160e58c9bfa75506f9c18f3aa
2800+
checksum: 10c0/3765c5d0fa3e95fb2ebe9d5a6d4da0156f5d346c7ec9ac0fbf5c97c8139d0ca1e8743bf5dc1b4aa954467be6929fddf8498a3b6202d468d70b5f359f3b6af90f
27792801
languageName: node
27802802
linkType: hard
27812803

@@ -2899,7 +2921,7 @@ __metadata:
28992921
languageName: node
29002922
linkType: hard
29012923

2902-
"browserslist@npm:^4.0.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0, browserslist@npm:^4.25.0, browserslist@npm:^4.27.0, browserslist@npm:^4.28.0, browserslist@npm:^4.28.1":
2924+
"browserslist@npm:^4.0.0, browserslist@npm:^4.23.3, browserslist@npm:^4.24.0, browserslist@npm:^4.25.0, browserslist@npm:^4.28.1":
29032925
version: 4.28.1
29042926
resolution: "browserslist@npm:4.28.1"
29052927
dependencies:
@@ -2973,10 +2995,10 @@ __metadata:
29732995
languageName: node
29742996
linkType: hard
29752997

2976-
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001754, caniuse-lite@npm:^1.0.30001759":
2977-
version: 1.0.30001759
2978-
resolution: "caniuse-lite@npm:1.0.30001759"
2979-
checksum: 10c0/b0f415960ba34995cda18e0d25c4e602f6917b9179290a76bdd0311423505b78cc93e558a90c98a22a1cc6b1781ab720ef6beea24ec7e29a1c1164ca72eac3a2
2998+
"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001759, caniuse-lite@npm:^1.0.30001760":
2999+
version: 1.0.30001761
3000+
resolution: "caniuse-lite@npm:1.0.30001761"
3001+
checksum: 10c0/8ea4158ccd507b9c73c03b9b3b1b897e75d095c5753a131d0f36ef9b64c19a049174467842dd9e8bebe886ac27ed7a5b1d5adcaae5fe887716b07fc1103e100b
29803002
languageName: node
29813003
linkType: hard
29823004

@@ -3322,10 +3344,10 @@ __metadata:
33223344
languageName: node
33233345
linkType: hard
33243346

3325-
"cssdb@npm:^8.5.2":
3326-
version: 8.5.2
3327-
resolution: "cssdb@npm:8.5.2"
3328-
checksum: 10c0/12f7ed29dda0d74b209d6470acd246b335aac507c2786c17f20709f856eabb24e6d43ff44507898f5a1b0a101b286b997d95682e44b06f4c7cb4bd7081db7c32
3347+
"cssdb@npm:^8.6.0":
3348+
version: 8.6.0
3349+
resolution: "cssdb@npm:8.6.0"
3350+
checksum: 10c0/4bb7b77ba24902e8d481e9514ec0be56e205186a2b7d9f5027fedfe718952c559c62acfd2859f92869f8090da7c2170f83d68170db5058a6ba8d9d5e8ded3b3e
33293351
languageName: node
33303352
linkType: hard
33313353

@@ -4513,7 +4535,7 @@ __metadata:
45134535
mini-css-extract-plugin: "npm:2.9.4"
45144536
postcss: "npm:8.5.6"
45154537
postcss-loader: "npm:8.2.0"
4516-
postcss-preset-env: "npm:10.5.0"
4538+
postcss-preset-env: "npm:10.6.0"
45174539
postcss-scss: "npm:4.0.9"
45184540
prettier: "npm:3.7.4"
45194541
sass: "npm:1.97.1"
@@ -5184,13 +5206,6 @@ __metadata:
51845206
languageName: node
51855207
linkType: hard
51865208

5187-
"normalize-range@npm:^0.1.2":
5188-
version: 0.1.2
5189-
resolution: "normalize-range@npm:0.1.2"
5190-
checksum: 10c0/bf39b73a63e0a42ad1a48c2bd1bda5a07ede64a7e2567307a407674e595bcff0fa0d57e8e5f1e7fa5e91000797c7615e13613227aaaa4d6d6e87f5bd5cc95de6
5191-
languageName: node
5192-
linkType: hard
5193-
51945209
"nth-check@npm:^2.0.1":
51955210
version: 2.1.1
51965211
resolution: "nth-check@npm:2.1.1"
@@ -6018,9 +6033,9 @@ __metadata:
60186033
languageName: node
60196034
linkType: hard
60206035

6021-
"postcss-preset-env@npm:10.5.0":
6022-
version: 10.5.0
6023-
resolution: "postcss-preset-env@npm:10.5.0"
6036+
"postcss-preset-env@npm:10.6.0":
6037+
version: 10.6.0
6038+
resolution: "postcss-preset-env@npm:10.6.0"
60246039
dependencies:
60256040
"@csstools/postcss-alpha-function": "npm:^1.0.1"
60266041
"@csstools/postcss-cascade-layers": "npm:^5.0.2"
@@ -6051,21 +6066,23 @@ __metadata:
60516066
"@csstools/postcss-oklab-function": "npm:^4.0.12"
60526067
"@csstools/postcss-position-area-property": "npm:^1.0.0"
60536068
"@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
6069+
"@csstools/postcss-property-rule-prelude-list": "npm:^1.0.0"
60546070
"@csstools/postcss-random-function": "npm:^2.0.1"
60556071
"@csstools/postcss-relative-color-syntax": "npm:^3.0.12"
60566072
"@csstools/postcss-scope-pseudo-class": "npm:^4.0.1"
60576073
"@csstools/postcss-sign-functions": "npm:^1.1.4"
60586074
"@csstools/postcss-stepped-value-functions": "npm:^4.0.9"
6075+
"@csstools/postcss-syntax-descriptor-syntax-production": "npm:^1.0.1"
60596076
"@csstools/postcss-system-ui-font-family": "npm:^1.0.0"
60606077
"@csstools/postcss-text-decoration-shorthand": "npm:^4.0.3"
60616078
"@csstools/postcss-trigonometric-functions": "npm:^4.0.9"
60626079
"@csstools/postcss-unset-value": "npm:^4.0.0"
6063-
autoprefixer: "npm:^10.4.22"
6064-
browserslist: "npm:^4.28.0"
6080+
autoprefixer: "npm:^10.4.23"
6081+
browserslist: "npm:^4.28.1"
60656082
css-blank-pseudo: "npm:^7.0.1"
60666083
css-has-pseudo: "npm:^7.0.3"
60676084
css-prefers-color-scheme: "npm:^10.0.0"
6068-
cssdb: "npm:^8.5.2"
6085+
cssdb: "npm:^8.6.0"
60696086
postcss-attribute-case-insensitive: "npm:^7.0.1"
60706087
postcss-clamp: "npm:^4.1.0"
60716088
postcss-color-functional-notation: "npm:^7.0.12"
@@ -6093,7 +6110,7 @@ __metadata:
60936110
postcss-selector-not: "npm:^8.0.1"
60946111
peerDependencies:
60956112
postcss: ^8.4
6096-
checksum: 10c0/4e9881478b465e8eb7493c1240cb2df8523944135728672e8feeb8bb3f6a48b00d67d007ee8fbdcee648ab9ebdfca10a7591f42e3c6b9076cbf7f355f8ad1574
6113+
checksum: 10c0/61162c9d675004db842d58829605c3c9ee81ed1a15684793a419b94c2c28e3be2ff9a7373f0996a1a255caf208d8f3d5dd907e61af1bbb0c7634e3215e87fc56
60976114
languageName: node
60986115
linkType: hard
60996116

0 commit comments

Comments
 (0)