Skip to content

Commit f9a5e78

Browse files
committed
Specify okhttp dependency
This is needed since Spring Boot no longer manages the version. The version is managed in Spring Cloud Commons. See spring-cloud/spring-cloud-commons#1470. Fixes spring-cloud#1813
1 parent 4bfa556 commit f9a5e78

File tree

2 files changed

+11
-5
lines changed
  • spring-cloud-kubernetes-fabric8-autoconfig
  • spring-cloud-kubernetes-fabric8-leader

2 files changed

+11
-5
lines changed

spring-cloud-kubernetes-fabric8-autoconfig/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,17 @@
4949
<groupId>org.springframework.cloud</groupId>
5050
<artifactId>spring-cloud-kubernetes-commons</artifactId>
5151
</dependency>
52+
<!-- Spring Boot removed its dependency management of okhttp in Spring Boot 3.4.0 -->
53+
<!-- This resulted in a different version fo okhttp in Spring Cloud 2024.0.0 -->
54+
<!-- Spring Cloud is now managing the okhttp dependency version in Spring Cloud Commons -->
55+
<dependency>
56+
<groupId>com.squareup.okhttp3</groupId>
57+
<artifactId>okhttp</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>com.squareup.okhttp3</groupId>
61+
<artifactId>logging-interceptor</artifactId>
62+
</dependency>
5263
<dependency>
5364
<groupId>org.springframework.boot</groupId>
5465
<artifactId>spring-boot-starter-logging</artifactId>

spring-cloud-kubernetes-fabric8-leader/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,5 @@
6767
<artifactId>spring-cloud-kubernetes-test-support</artifactId>
6868
<scope>test</scope>
6969
</dependency>
70-
<dependency>
71-
<groupId>org.springframework.cloud</groupId>
72-
<artifactId>spring-cloud-kubernetes-test-support</artifactId>
73-
<scope>test</scope>
74-
</dependency>
7570
</dependencies>
7671
</project>

0 commit comments

Comments
 (0)