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

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

# Conflicts:
#	docs/package.json

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"
   }
 }

spring-cloud-commons-dependencies/pom.xml

@@ -15,6 +15,7 @@
 	<name>spring-cloud-commons-dependencies</name>
 	<description>Spring Cloud Commons Dependencies</description>
 	<properties>
+		<okhttp.version>4.12.0</okhttp.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -53,6 +54,20 @@
 				<artifactId>spring-cloud-test-support</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<!-- Spring Boot removed its dependency management of okhttp in Spring Boot 3.4.0 -->
+			<!-- This resulted in a different version fo okhttp in Spring Cloud 2024.0.0 -->
+			<!-- We will now manage the version in Spring Cloud Commons to maintain backward compatibility -->
+			<!-- This can be removed in the next major -->
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>${okhttp.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>logging-interceptor</artifactId>
+				<version>${okhttp.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<profiles>

spring-cloud-commons/pom.xml

@@ -176,6 +176,16 @@
 			<artifactId>httpclient5</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>okhttp</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>logging-interceptor</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>