Merge branch '4.2.x' into 4.3.x

ryanjbaxter · ryanjbaxter · commit 25486bf59268 · 2025-10-06T14:48:53.000-04:00
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
+    branches: [ main, 4.3.x, 4.2.x ]
   pull_request:
-    branches: [ main, 4.2.x, 4.1.x, 3.1.x ]
+    branches: [ main, 4.3.x, 4.2.x ]
 
 jobs:
   build:
diff --git a/docs/package.json b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "antora": "3.2.0-alpha.9",
-    "@antora/atlas-extension": "1.0.0-alpha.2",
+    "@antora/atlas-extension": "1.0.0-alpha.5",
     "@antora/collector-extension": "1.0.1",
     "@asciidoctor/tabs": "1.0.0-beta.6",
     "@springio/antora-extensions": "1.14.7",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`	`3`	`"antora": "3.2.0-alpha.9",`
`4`		`- "@antora/atlas-extension": "1.0.0-alpha.2",`
	`4`	`+ "@antora/atlas-extension": "1.0.0-alpha.5",`
`5`	`5`	`"@antora/collector-extension": "1.0.1",`
`6`	`6`	`"@asciidoctor/tabs": "1.0.0-beta.6",`
`7`	`7`	`"@springio/antora-extensions": "1.14.7",`