chore(deps): update spring boot to v3.4.0 (#3860)

* chore(deps): update spring boot to v3.4.0

pom.xml

@@ -26,7 +26,7 @@
     <description>Spring Boot Admin</description>
     <url>https://github.com/codecentric/spring-boot-admin/</url>
     <properties>
-        <revision>3.3.7-SNAPSHOT</revision>
+        <revision>3.4.0-SNAPSHOT</revision>
         <java.version>17</java.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -36,10 +36,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- used dependencies versions -->
-        <spring-boot.version>3.3.5</spring-boot.version>
-        <spring-cloud.version>2023.0.3</spring-cloud.version>
+        <spring-boot.version>3.4.0</spring-boot.version>
+        <spring-cloud.version>2024.0.0-RC1</spring-cloud.version>
         <wiremock.version>3.0.1</wiremock.version>
-        <hazelcast-tests.version>5.4.0</hazelcast-tests.version>
+        <hazelcast-tests.version>5.5.0</hazelcast-tests.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
         <awaitility.version>4.2.2</awaitility.version>
         <testcontainers.version>1.20.4</testcontainers.version>

spring-boot-admin-client/src/test/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfigurationTest.java

@@ -16,6 +16,8 @@
 
 package de.codecentric.boot.admin.client.config;
 
+import java.time.Duration;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
@@ -106,8 +108,8 @@ public void blockingClientInBlockingEnvironment() {
 
 				Integer connectTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
 				assertThat(connectTimeout).isEqualTo(1337);
-				Integer readTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "readTimeout");
-				assertThat(readTimeout).isEqualTo(42);
+				Duration readTimeout = (Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout");
+				assertThat(readTimeout).isEqualTo(Duration.ofMillis(42));
 			});
 	}
 

spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiAutoConfiguration.java

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -34,6 +35,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
 import org.springframework.web.reactive.config.WebFluxConfigurer;
 import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -204,10 +206,13 @@ public HomepageForwardingFilterConfig homepageForwardingFilterConfig() throws IO
 			public void addResourceHandlers(org.springframework.web.reactive.config.ResourceHandlerRegistry registry) {
 				registry.addResourceHandler(this.adminServer.path("/**"))
 					.addResourceLocations(this.adminUi.getResourceLocations())
-					.setCacheControl(this.adminUi.getCache().toCacheControl());
+					.setCacheControl(this.adminUi.getCache().toCacheControl())
+					.setMediaTypes(Map.of("js", new MediaType("application", "javascript")));
+
 				registry.addResourceHandler(this.adminServer.path("/extensions/**"))
 					.addResourceLocations(this.adminUi.getExtensionResourceLocations())
-					.setCacheControl(this.adminUi.getCache().toCacheControl());
+					.setCacheControl(this.adminUi.getCache().toCacheControl())
+					.setMediaTypes(Map.of("js", new MediaType("application", "javascript")));
 			}
 
 			@Bean

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/services/endpoints/QueryIndexEndpointStrategyTest.java

@@ -18,6 +18,8 @@
 
 import java.time.Duration;
 
+import javax.net.ssl.SSLException;
+
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.http.Fault;
 import io.netty.handler.ssl.SslContextBuilder;
@@ -57,10 +59,10 @@
 
 public class QueryIndexEndpointStrategyTest {
 
-	public WireMockServer wireMock = new WireMockServer(wireMockConfig().dynamicPort().dynamicHttpsPort());
-
 	private final ApiMediaTypeHandler apiMediaTypeHandler = new ApiMediaTypeHandler();
 
+	public WireMockServer wireMock = new WireMockServer(wireMockConfig().dynamicPort().dynamicHttpsPort());
+
 	private InstanceWebClient instanceWebClient = InstanceWebClient.builder()
 		.webClient(WebClient.builder().clientConnector(httpConnector()))
 		.filter(rewriteEndpointUrl())
@@ -260,8 +262,16 @@ public void should_retry() {
 	}
 
 	private ReactorClientHttpConnector httpConnector() {
-		SslContextBuilder sslCtx = SslContextBuilder.forClient().trustManager(InsecureTrustManagerFactory.INSTANCE);
-		HttpClient client = HttpClient.create().secure((ssl) -> ssl.sslContext(sslCtx));
+		HttpClient client = HttpClient.create().secure((ssl) -> {
+			try {
+				SslContextBuilder sslCtx = SslContextBuilder.forClient()
+					.trustManager(InsecureTrustManagerFactory.INSTANCE);
+				ssl.sslContext(sslCtx.build());
+			}
+			catch (SSLException ex) {
+				throw new RuntimeException(ex);
+			}
+		});
 		return new ReactorClientHttpConnector(client);
 	}