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

OlgaMaciaszek · OlgaMaciaszek · commit c38b20e8f581 · 2025-03-26T18:04:20.000+01:00
# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-openfeign-core/pom.xml
#	spring-cloud-openfeign-dependencies/pom.xml
#	spring-cloud-starter-openfeign/pom.xml
diff --git a/docs/package.json b/docs/package.json
@@ -5,6 +5,6 @@
 		"@antora/collector-extension": "1.0.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.4",
-		"@springio/asciidoctor-extensions": "1.0.0-alpha.16"
+		"@springio/asciidoctor-extensions": "1.0.0-alpha.17"
 	}
 }

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