Merge remote-tracking branch 'origin/4.1.x' into 4.2.x

OlgaMaciaszek · OlgaMaciaszek · commit ae520ef20a9b · 2025-03-04T15:30:40.000+01:00
Signed-off-by: Olga Maciaszek-Sharma &lt;olga.maciaszek-sharma@broadcom.com&gt;

# Conflicts:
#	docs/package.json
diff --git a/docs/package.json b/docs/package.json
@@ -4,7 +4,7 @@
     "@antora/atlas-extension": "1.0.0-alpha.2",
     "@antora/collector-extension": "1.0.1",
     "@asciidoctor/tabs": "1.0.0-beta.6",
-    "@springio/antora-extensions": "1.14.2",
-    "@springio/asciidoctor-extensions": "1.0.0-alpha.16"
+		"@springio/antora-extensions": "1.14.4",
+		"@springio/asciidoctor-extensions": "1.0.0-alpha.16"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"@antora/atlas-extension": "1.0.0-alpha.2",`
`5`	`5`	`"@antora/collector-extension": "1.0.1",`
`6`	`6`	`"@asciidoctor/tabs": "1.0.0-beta.6",`
`7`		`- "@springio/antora-extensions": "1.14.2",`
`8`		`- "@springio/asciidoctor-extensions": "1.0.0-alpha.16"`
	`7`	`+ "@springio/antora-extensions": "1.14.4",`
	`8`	`+ "@springio/asciidoctor-extensions": "1.0.0-alpha.16"`
`9`	`9`	`}`
`10`	`10`	`}`