root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Trigger Docs Build (push) Blocked by required conditions Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:21], map[id:windows-latest name:Windows]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:24], map[id:windows-latest name:Windows]) (push) Waiting to run Details
Run CodeQL Analysis / run-analysis (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:false version:17]) (push) Waiting to run Details
Run System Tests / Java ${{ matrix.java.version}} (map[toolchain:true version:21]) (push) Waiting to run Details 

Closes gh-46585
This commit is contained in:
Stéphane Nicoll 2025-07-22 16:34:19 +02:00
parent afea7e63a1 4f875ad39b
commit a11a50cab9
3 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@ -16,6 +16,7 @@
plugins { plugins {
id "java-library" id "java-library"
id "org.springframework.boot.configuration-properties"
id "org.springframework.boot.deployed" id "org.springframework.boot.deployed"
id "org.springframework.boot.docker-test" id "org.springframework.boot.docker-test"
id "org.springframework.boot.optional-dependencies" id "org.springframework.boot.optional-dependencies"
@ -144,16 +145,6 @@ dependencies {
testImplementation("org.thymeleaf:thymeleaf") testImplementation("org.thymeleaf:thymeleaf")
} }
configurations {
configurationPropertiesMetadata
}
artifacts {
configurationPropertiesMetadata new File(sourceSets.main.output.resourcesDir, "META-INF/spring-configuration-metadata.json"), { artifact ->
artifact.builtBy sourceSets.main.processResourcesTaskName
}
}
test { test {
include "**/*Tests.class" include "**/*Tests.class"
} }

9
spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/SpringBootMockMvcBuilderCustomizer.java
View File

@ -59,10 +59,19 @@ public class SpringBootMockMvcBuilderCustomizer implements MockMvcBuilderCustomi
private final WebApplicationContext context; private final WebApplicationContext context;
/**
* Whether to add servlet filters.
*/
private boolean addFilters = true; private boolean addFilters = true;
/**
* MVC Print option.
*/
private MockMvcPrint print = MockMvcPrint.DEFAULT; private MockMvcPrint print = MockMvcPrint.DEFAULT;
/**
* Whether to only print failed exchanges.
*/
private boolean printOnlyOnFailure = true; private boolean printOnlyOnFailure = true;
/** /**

18
spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json → spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -6,24 +6,6 @@
"description": "Type of existing DataSource to replace.", "description": "Type of existing DataSource to replace.",
"defaultValue": "any" "defaultValue": "any"
}, },
{
"name": "spring.test.mockmvc.add-filters",
"type": "java.lang.Boolean",
"description": "Whether to add servlet filters.",
"defaultValue": true
},
{
"name": "spring.test.mockmvc.print",
"type": "org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrint",
"description": "MVC Print option.",
"defaultValue": "default"
},
{
"name": "spring.test.mockmvc.print-only-on-failure",
"type": "java.lang.Boolean",
"description": "Whether to only print failed exchanges.",
"defaultValue": true
},
{ {
"name": "spring.test.observability.auto-configure", "name": "spring.test.observability.auto-configure",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",