Merge branch '3.5.x' into 4.0.x

Closes gh-49636

antora/package-lock.json

@@ -12,7 +12,7 @@
         "@springio/antora-extensions": "1.14.7",
         "@springio/antora-xref-extension": "1.0.0-alpha.5",
         "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.10",
-        "@springio/asciidoctor-extensions": "1.0.0-alpha.17"
+        "@springio/asciidoctor-extensions": "1.0.0-alpha.18"
       }
     },
     "node_modules/@antora/asciidoc-loader": {
@@ -511,15 +511,15 @@
       }
     },
     "node_modules/@springio/asciidoctor-extensions": {
-      "version": "1.0.0-alpha.17",
-      "resolved": "https://registry.npmjs.org/@springio/asciidoctor-extensions/-/asciidoctor-extensions-1.0.0-alpha.17.tgz",
-      "integrity": "sha512-mvVEKZNdGQu1+raOF+sy1DKWZrq1bB0dM4ZVlIIFV+jJ/mengXByq7YQk63nMOFsue6fGlgb3nQUte8EbvoQAw==",
+      "version": "1.0.0-alpha.18",
+      "resolved": "https://registry.npmjs.org/@springio/asciidoctor-extensions/-/asciidoctor-extensions-1.0.0-alpha.18.tgz",
+      "integrity": "sha512-deR4Dsl7GXKrmP4f1Xk2UHVrZ21Cn9sGbcxgwmpZbdvVAD4E8Gnmckns4Awmre6K6dJkaqCK9j4yoQQ9NGyN3g==",
       "license": "ASL-2.0",
       "dependencies": {
         "js-yaml": "~4.1"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/abort-controller": {

antora/package.json

@@ -10,7 +10,7 @@
     "@springio/antora-xref-extension": "1.0.0-alpha.5",
     "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.10",
     "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.17"
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.18"
   },
   "config": {
     "ui-bundle-url": "https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.25/ui-bundle.zip"