chore(deps): update spring boot to v3.0.6 (#2404)

* chore(deps): update spring boot to v3.0.6 * fix test * fix test --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stephan Köninger <stephan.koeninger@codecentric.de>
codecentric · Apr 21, 2023 · a9827b4 · a9827b4
1 parent 1c10983
commit a9827b4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- used dependencies versions -->
-        <spring-boot.version>3.0.5</spring-boot.version>
+        <spring-boot.version>3.0.6</spring-boot.version>
         <spring-cloud.version>2022.0.2</spring-cloud.version>
         <wiremock.version>2.35.0</wiremock.version>
         <hazelcast-tests.version>5.2.3</hazelcast-tests.version>

diff --git a/...-ui/src/test/java/de/codecentric/boot/admin/server/ui/AbstractAdminUiApplicationTest.java b/...-ui/src/test/java/de/codecentric/boot/admin/server/ui/AbstractAdminUiApplicationTest.java
@@ -103,10 +103,12 @@ public void should_return_correct_content_type_for_js_extensions() {
 					.header("Accept", "*/*")
 					.exchange()
 					.expectStatus().isOk()
-					.expectHeader().contentType(MediaType.parseMediaType("application/javascript"));
+					.expectHeader().contentType(getExpectedMediaTypeForJavaScript());
 		//@formatter:on
 	}
 
+	abstract MediaType getExpectedMediaTypeForJavaScript();
+
 	@Test
 	public void should_return_correct_content_type_for_css_extensions() {
 		//@formatter:off

diff --git a/...-ui/src/test/java/de/codecentric/boot/admin/server/ui/AdminUiReactiveApplicationTest.java b/...-ui/src/test/java/de/codecentric/boot/admin/server/ui/AdminUiReactiveApplicationTest.java
@@ -25,6 +25,7 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.MediaType;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
 
@@ -57,6 +58,11 @@ public void setupEach() {
 		super.setUp(port);
 	}
 
+	@Override
+	MediaType getExpectedMediaTypeForJavaScript() {
+		return MediaType.parseMediaType("application/javascript");
+	}
+
 	@EnableAdminServer
 	@EnableAutoConfiguration
 	@SpringBootConfiguration

diff --git a/...r-ui/src/test/java/de/codecentric/boot/admin/server/ui/AdminUiServletApplicationTest.java b/...r-ui/src/test/java/de/codecentric/boot/admin/server/ui/AdminUiServletApplicationTest.java
@@ -25,6 +25,7 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.web.SecurityFilterChain;
 
@@ -50,6 +51,11 @@ public void shutdown() {
 		this.instance.close();
 	}
 
+	@Override
+	MediaType getExpectedMediaTypeForJavaScript() {
+		return MediaType.parseMediaType("text/javascript");
+	}
+
 	@EnableAdminServer
 	@EnableAutoConfiguration
 	@SpringBootConfiguration