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

Signed-off-by: Olga Maciaszek-Sharma <[email protected]>

# Conflicts:
#	pom.xml

Author: OlgaMaciaszek

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/antora-extensions": "1.14.4",
     "@springio/asciidoctor-extensions": "1.0.0-alpha.16"
   }
 }

pom.xml

@@ -24,6 +24,7 @@
 		<spring-cloud-commons.version>4.3.0-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-config.version>4.3.0-SNAPSHOT</spring-cloud-config.version>
 		<testcontainers.version>1.20.4</testcontainers.version>
+		<testcontainers.version>1.20.5</testcontainers.version>
 		<mockserverclient.version>5.15.0</mockserverclient.version>
 
 		<!-- Sonar -->