Merge branch '3.4.x' into 3.5.x

Closes gh-47362

Author: snicoll

antora/package-lock.json

@@ -12,7 +12,7 @@
     "@springio/antora-zip-contents-collector-extension": "1.0.0-alpha.8",
     "@asciidoctor/tabs": "1.0.0-beta.6",
     "@springio/asciidoctor-extensions": "1.0.0-alpha.17",
-    "patch-package": "^8.0.0"
+    "patch-package": "^8.0.1"
   },
   "config": {
     "ui-bundle-url": "https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.18/ui-bundle.zip"