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

Upgrade to JUnit Jupiter 6.0.0 

Closes gh-47383
This commit is contained in:
Moritz Halbritter 2025-10-02 14:16:29 +02:00
parent dec46b45d7
commit 4c8cabcb3a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java
View File

@ -128,7 +128,7 @@ public class OutputCaptureExtension
} }
private OutputCapture getOutputCapture(ExtensionContext context) { private OutputCapture getOutputCapture(ExtensionContext context) {
return getStore(context).getOrComputeIfAbsent(OutputCapture.class, (key) -> new OutputCapture(), return getStore(context).computeIfAbsent(OutputCapture.class, (key) -> new OutputCapture(),
OutputCapture.class); OutputCapture.class);
} }

2
gradle.properties
View File

@ -14,7 +14,7 @@ hamcrestVersion=3.0
jackson2Version=2.20.0 jackson2Version=2.20.0
jacksonVersion=3.0.0-rc9 jacksonVersion=3.0.0-rc9
javaFormatVersion=0.0.47 javaFormatVersion=0.0.47
junitJupiterVersion=5.13.4 junitJupiterVersion=6.0.0
kotlinVersion=2.2.10 kotlinVersion=2.2.10
mavenVersion=3.9.10 mavenVersion=3.9.10
mockitoVersion=5.19.0 mockitoVersion=5.19.0

2
module/spring-boot-tx/src/test/java/org/springframework/boot/transaction/jta/autoconfigure/JtaAutoConfigurationTests.java
View File

@ -168,7 +168,7 @@ class JtaAutoConfigurationTests {
public void beforeEach(ExtensionContext context) throws Exception { public void beforeEach(ExtensionContext context) throws Exception {
Namespace namespace = Namespace.create(getClass(), context.getUniqueId()); Namespace namespace = Namespace.create(getClass(), context.getUniqueId());
context.getStore(namespace) context.getStore(namespace)
.getOrComputeIfAbsent(InitialContext.class, (k) -> createInitialContext(), InitialContext.class); .computeIfAbsent(InitialContext.class, (k) -> createInitialContext(), InitialContext.class);
} }
private InitialContext createInitialContext() { private InitialContext createInitialContext() {

2
test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java
View File

@ -103,7 +103,7 @@ public class OutputCaptureExtension
} }
private OutputCapture getOutputCapture(ExtensionContext context) { private OutputCapture getOutputCapture(ExtensionContext context) {
return getStore(context).getOrComputeIfAbsent(OutputCapture.class); return getStore(context).computeIfAbsent(OutputCapture.class);
} }
private Store getStore(ExtensionContext context) { private Store getStore(ExtensionContext context) {