From 4c8cabcb3ae4e1d738a65ecfbfc619d8085710d4 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 2 Oct 2025 14:16:29 +0200 Subject: [PATCH] Upgrade to JUnit Jupiter 6.0.0 Closes gh-47383 --- .../boot/test/system/OutputCaptureExtension.java | 2 +- gradle.properties | 2 +- .../jta/autoconfigure/JtaAutoConfigurationTests.java | 2 +- .../boot/testsupport/system/OutputCaptureExtension.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java b/core/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java index d946c81a4a7..ed524a53b2a 100644 --- a/core/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java +++ b/core/spring-boot-test/src/main/java/org/springframework/boot/test/system/OutputCaptureExtension.java @@ -128,7 +128,7 @@ public class OutputCaptureExtension } 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); } diff --git a/gradle.properties b/gradle.properties index 83dfc74a805..1337de7da6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ hamcrestVersion=3.0 jackson2Version=2.20.0 jacksonVersion=3.0.0-rc9 javaFormatVersion=0.0.47 -junitJupiterVersion=5.13.4 +junitJupiterVersion=6.0.0 kotlinVersion=2.2.10 mavenVersion=3.9.10 mockitoVersion=5.19.0 diff --git a/module/spring-boot-tx/src/test/java/org/springframework/boot/transaction/jta/autoconfigure/JtaAutoConfigurationTests.java b/module/spring-boot-tx/src/test/java/org/springframework/boot/transaction/jta/autoconfigure/JtaAutoConfigurationTests.java index db57859c636..5059c724dc4 100644 --- a/module/spring-boot-tx/src/test/java/org/springframework/boot/transaction/jta/autoconfigure/JtaAutoConfigurationTests.java +++ b/module/spring-boot-tx/src/test/java/org/springframework/boot/transaction/jta/autoconfigure/JtaAutoConfigurationTests.java @@ -168,7 +168,7 @@ class JtaAutoConfigurationTests { public void beforeEach(ExtensionContext context) throws Exception { Namespace namespace = Namespace.create(getClass(), context.getUniqueId()); context.getStore(namespace) - .getOrComputeIfAbsent(InitialContext.class, (k) -> createInitialContext(), InitialContext.class); + .computeIfAbsent(InitialContext.class, (k) -> createInitialContext(), InitialContext.class); } private InitialContext createInitialContext() { diff --git a/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java b/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java index 114fa9dcbe8..eceaa71ce60 100644 --- a/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java +++ b/test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/system/OutputCaptureExtension.java @@ -103,7 +103,7 @@ public class OutputCaptureExtension } private OutputCapture getOutputCapture(ExtensionContext context) { - return getStore(context).getOrComputeIfAbsent(OutputCapture.class); + return getStore(context).computeIfAbsent(OutputCapture.class); } private Store getStore(ExtensionContext context) {