Merge pull request #1924 from ryanjbaxter/upgrade-to-fabric8-7.3.0

Upgrade to fabric8 7.3.0

Author: ryanjbaxter

pom.xml

@@ -80,14 +80,6 @@
 		</maven-checkstyle-plugin.failsOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true
 		</maven-checkstyle-plugin.includeTestSourceDirectory>
-		<!-- We are overriding the version of Jackson here because Fabric8 is
-			 is not compatible with Jackson 2.19.0 which used in Spring Boot 3.5.x
-			 We cannot use Jackson 2.19.0 until we can upgrade to Fabric8
-			 7.3.0.
-			 See https://github.com/fabric8io/kubernetes-client/issues/7036
-			 See https://github.com/spring-projects/spring-boot/commit/e1ff4fbaf99bfcfdf0828ed07664b208a3ca6157
-		-->
-		<jackson.version>2.18.4</jackson.version>
 	</properties>
 
 	<modules>

spring-cloud-kubernetes-dependencies/pom.xml

@@ -32,7 +32,7 @@
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
 	<properties>
-		<kubernetes-fabric8-client.version>6.13.5</kubernetes-fabric8-client.version>
+		<kubernetes-fabric8-client.version>7.3.1</kubernetes-fabric8-client.version>
 		<kubernetes-native-client.version>19.0.2</kubernetes-native-client.version>
 		<wiremock.version>3.9.2</wiremock.version>
 	</properties>

spring-cloud-kubernetes-fabric8-autoconfig/src/test/java/org/springframework/cloud/kubernetes/fabric8/Fabric8UserAgentDefaultConfigurationTests.java

@@ -37,7 +37,7 @@ class Fabric8UserAgentDefaultConfigurationTests {
 	@Test
 	void testUserAgent() {
 		String userAgent = client.getConfiguration().getUserAgent();
-		assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/6.13.5");
+		assertThat(userAgent).isEqualTo("fabric8-kubernetes-client/7.3.1");
 	}
 
 }

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

@@ -76,19 +76,16 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>${jackson.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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

@@ -113,24 +113,6 @@
 			<artifactId>spring-cloud-kubernetes-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 </project>

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

@@ -74,23 +74,5 @@
 			<artifactId>spring-cloud-kubernetes-test-support</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${jackson.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${jackson.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${jackson.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>