spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 20:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x' into 4.0.x

Browse Source 
Closes gh-50604
This commit is contained in:
Stéphane Nicoll
2026-05-29 10:15:29 +02:00
parent 524d0ace3d cb06492523
commit dd04d8b323
2 changed files with 92 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
antora/package-lock.json
Generated
+91 -10
View File
@@ -6,7 +6,7 @@
"": {
"dependencies": {
"@antora/atlas-extension": "1.0.0-alpha.5",
"@antora/cli": "3.2.0-alpha.11",
"@antora/cli": "3.2.0-alpha.12",
"@antora/site-generator": "3.2.0-alpha.11",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.11",
@@ -45,15 +45,15 @@
}
},
"node_modules/@antora/cli": {
"version": "3.2.0-alpha.11",
"resolved": "https://registry.npmjs.org/@antora/cli/-/cli-3.2.0-alpha.11.tgz",
"integrity": "sha512-hyCVmJT/esg6raPFyR1aIpUuGwXbe/0cAGPlQ86Ag/m7CUP80mQEZaVN1NxyVOK/KmtF5E7qpNvksDetBtGvcw==",
"version": "3.2.0-alpha.12",
"resolved": "https://registry.npmjs.org/@antora/cli/-/cli-3.2.0-alpha.12.tgz",
"integrity": "sha512-UaRcJBLpEas8kMVCJcZit41+/EMTS0HBHIYripf98HzyB3ljGYp8M6kMMvrO/YdHohMgF65aSjz6sSSrHYDpwg==",
"license": "MPL-2.0",
"dependencies": {
"@antora/logger": "3.2.0-alpha.11",
"@antora/playbook-builder": "3.2.0-alpha.11",
"@antora/logger": "3.2.0-alpha.12",
"@antora/playbook-builder": "3.2.0-alpha.12",
"@antora/user-require-helper": "~3.0",
"commander": "~12.1"
"commander": "~13.1"
},
"bin": {
"antora": "bin/antora"
@@ -62,6 +62,81 @@
"node": ">=18.0.0"
}
},
"node_modules/@antora/cli/node_modules/@antora/logger": {
"version": "3.2.0-alpha.12",
"resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.2.0-alpha.12.tgz",
"integrity": "sha512-feyaa9w79rKuQQ9A1HpLYHNrAVgo8Oc3J/Ptu6M9XCm/T7utNA79z8DyQWL4yQADrI64f52sZv9PpSAF7EVz8A==",
"license": "MPL-2.0",
"dependencies": {
"@antora/expand-path-helper": "~3.0",
"pino": "10.1.0"
},
"engines": {
"node": ">=18.0.0"
}
},
"node_modules/@antora/cli/node_modules/@antora/playbook-builder": {
"version": "3.2.0-alpha.12",
"resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.2.0-alpha.12.tgz",
"integrity": "sha512-mOLSX7Xr297Svt3UCka0ebPN9eKq2/2qZVwgflQXZruEMY6hl6sqey8tGYZhcINKYGcGEej4EXGj0R0u1xt0oA==",
"license": "MPL-2.0",
"dependencies": {
"@iarna/toml": "~2.2",
"convict": "~6.2",
"js-yaml": "~4.1",
"json5": "~2.2"
},
"engines": {
"node": ">=18.0.0"
}
},
"node_modules/@antora/cli/node_modules/pino": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/pino/-/pino-10.1.0.tgz",
"integrity": "sha512-0zZC2ygfdqvqK8zJIr1e+wT1T/L+LF6qvqvbzEQ6tiMAoTqEVK9a1K3YRu8HEUvGEvNqZyPJTtb2sNIoTkB83w==",
"license": "MIT",
"dependencies": {
"@pinojs/redact": "^0.4.0",
"atomic-sleep": "^1.0.0",
"on-exit-leak-free": "^2.1.0",
"pino-abstract-transport": "^2.0.0",
"pino-std-serializers": "^7.0.0",
"process-warning": "^5.0.0",
"quick-format-unescaped": "^4.0.3",
"real-require": "^0.2.0",
"safe-stable-stringify": "^2.3.1",
"sonic-boom": "^4.0.1",
"thread-stream": "^3.0.0"
},
"bin": {
"pino": "bin.js"
}
},
"node_modules/@antora/cli/node_modules/pino-abstract-transport": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-2.0.0.tgz",
"integrity": "sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==",
"license": "MIT",
"dependencies": {
"split2": "^4.0.0"
}
},
"node_modules/@antora/cli/node_modules/process-warning": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/process-warning/-/process-warning-5.0.0.tgz",
"integrity": "sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/fastify"
},
{
"type": "opencollective",
"url": "https://opencollective.com/fastify"
}
],
"license": "MIT"
},
"node_modules/@antora/content-aggregator": {
"version": "3.2.0-alpha.11",
"resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.2.0-alpha.11.tgz",
@@ -395,6 +470,12 @@
"node": ">= 8"
}
},
"node_modules/@pinojs/redact": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/@pinojs/redact/-/redact-0.4.0.tgz",
"integrity": "sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==",
"license": "MIT"
},
"node_modules/@pkgjs/parseargs": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -1090,9 +1171,9 @@
"license": "MIT"
},
"node_modules/commander": {
"version": "12.1.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
"integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
"version": "13.1.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
"integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
"license": "MIT",
"engines": {
"node": ">=18"
antora/package.json
+1 -1
View File
@@ -3,7 +3,7 @@
"antora": "node npm/antora.js"
},
"dependencies": {
"@antora/cli": "3.2.0-alpha.11",
"@antora/cli": "3.2.0-alpha.12",
"@antora/site-generator": "3.2.0-alpha.11",
"@antora/atlas-extension": "1.0.0-alpha.5",
"@springio/antora-extensions": "1.14.11",