spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source
This commit is contained in:
Stéphane Nicoll
2026-05-30 13:09:44 +02:00
parent 5184df63d6 1a092b779f
commit f3cbe60e08
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-http-codec/build.gradle
+1
View File
@@ -30,6 +30,7 @@ dependencies {
optional(project(":core:spring-boot-autoconfigure"))
optional(project(":core:spring-boot-test"))
optional(project(":module:spring-boot-gson"))
optional(project(":module:spring-boot-jackson"))
optional(project(":module:spring-boot-jackson2"))
optional(project(":module:spring-boot-kotlinx-serialization-json"))
module/spring-boot-http-codec/src/test/java/org/springframework/boot/http/codec/autoconfigure/CodecsAutoConfigurationTests.java
+2 -1
View File
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import kotlinx.serialization.json.Json;
import org.junit.jupiter.api.Test;
import tools.jackson.databind.json.JsonMapper;
@@ -150,7 +151,7 @@ class CodecsAutoConfigurationTests {
@Test
void kotlinSerializationUsesUnrestrictedPredicateWhenNoOtherJsonConverterIsAvailable() {
FilteredClassLoader classLoader = new FilteredClassLoader(JsonMapper.class.getPackage().getName(),
ObjectMapper.class.getPackage().getName());
ObjectMapper.class.getPackage().getName(), Gson.class.getPackage().getName());
this.contextRunner.withClassLoader(classLoader)
.withUserConfiguration(KotlinxJsonConfiguration.class)
.run((context) -> {