Merge branch '3.4.x' into 3.5.x

Closes gh-48375

antora/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "dependencies": {
         "@antora/atlas-extension": "1.0.0-alpha.5",
-        "@antora/cli": "3.2.0-alpha.10",
+        "@antora/cli": "3.2.0-alpha.11",
         "@antora/site-generator": "3.2.0-alpha.10",
         "@asciidoctor/tabs": "1.0.0-beta.6",
         "@springio/antora-extensions": "1.14.7",
@@ -54,13 +54,13 @@
       }
     },
     "node_modules/@antora/cli": {
-      "version": "3.2.0-alpha.10",
-      "resolved": "https://registry.npmjs.org/@antora/cli/-/cli-3.2.0-alpha.10.tgz",
-      "integrity": "sha512-7camaWi34Z2WtienCY6RX/LqIPIoNGmDA1wGuBNP58XGT6UVlE109fjeCkY0H1fKDKZ68hmnSnAMFLj+wTKUZw==",
+      "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==",
       "license": "MPL-2.0",
       "dependencies": {
-        "@antora/logger": "3.2.0-alpha.10",
-        "@antora/playbook-builder": "3.2.0-alpha.10",
+        "@antora/logger": "3.2.0-alpha.11",
+        "@antora/playbook-builder": "3.2.0-alpha.11",
         "@antora/user-require-helper": "~3.0",
         "commander": "~12.1"
       },
@@ -71,6 +71,46 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@antora/cli/node_modules/@antora/expand-path-helper": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@antora/expand-path-helper/-/expand-path-helper-3.0.0.tgz",
+      "integrity": "sha512-7PdEIhk97v85/CSm3HynCsX14TR6oIVz1s233nNLsiWubE8tTnpPt4sNRJR+hpmIZ6Bx9c6QDp3XIoiyu/WYYA==",
+      "license": "MPL-2.0",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@antora/cli/node_modules/@antora/logger": {
+      "version": "3.2.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@antora/logger/-/logger-3.2.0-alpha.11.tgz",
+      "integrity": "sha512-reiqsBqpllqRsuJhcPqbe7roOR3Ja+LfysTzyDzgrXS7liu5BexlwHCPOn9MqScT3A+fhUYajnck8t+w6+fcgQ==",
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@antora/expand-path-helper": "~3.0",
+        "pino": "~9.2",
+        "pino-pretty": "~11.2",
+        "sonic-boom": "~4.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@antora/cli/node_modules/@antora/playbook-builder": {
+      "version": "3.2.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.2.0-alpha.11.tgz",
+      "integrity": "sha512-rI707tLA3sGigNTEaoQzCDBn1pIyQa35ktf7OAO2kTYcUF9eLwf8gU3u68BqTwdh4ewuFG2uvHDEx6/6pTciNQ==",
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@iarna/toml": "~2.2",
+        "convict": "~6.2",
+        "js-yaml": "~4.1",
+        "json5": "~2.2",
+        "yargs-parser": "~20.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
     "node_modules/@antora/content-aggregator": {
       "version": "3.2.0-alpha.10",
       "resolved": "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.2.0-alpha.10.tgz",
@@ -2344,6 +2384,7 @@
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.4.0"
       }
@@ -2560,6 +2601,7 @@
       "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.2.1.tgz",
       "integrity": "sha512-yBxFFs3zmkvKNmR0pFSU//rIsYjuX418TnlDmc2weaq5XFDqDIV/NOMPBoLrbxjLH42p4UzRuXHryXh9dYcKcw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       }

antora/package.json

@@ -3,7 +3,7 @@
     "antora": "node npm/antora.js"
   },
   "dependencies": {
-    "@antora/cli": "3.2.0-alpha.10",
+    "@antora/cli": "3.2.0-alpha.11",
     "@antora/site-generator": "3.2.0-alpha.10",
     "@antora/atlas-extension": "1.0.0-alpha.5",
     "@springio/antora-extensions": "1.14.7",