Upgrade to JUnit 6

Also adjust QuarkusTestNestedTestCase as the order in which nested tests
are executed have changed and is now a lot more logical.

Author: gsmet

bom/application/pom.xml

@@ -129,7 +129,7 @@
         <db2-jdbc.version>12.1.0.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
-        <junit.jupiter.version>5.13.4</junit.jupiter.version>
+        <junit.jupiter.version>6.0.1</junit.jupiter.version>
         <infinispan.version>16.0.2</infinispan.version>
         <infinispan.protostream.version>6.0.1</infinispan.protostream.version>
         <caffeine.version>3.2.3</caffeine.version>

build-parent/pom.xml

@@ -82,7 +82,7 @@
         <opensearch-server.version>3.1.0</opensearch-server.version>
         <opensearch.image>docker.io/opensearchproject/opensearch:${opensearch-server.version}</opensearch.image>
         <opensearch.protocol>http</opensearch.protocol>
-        <junit-pioneer.version>2.2.0</junit-pioneer.version>
+        <junit-pioneer.version>2.3.0</junit-pioneer.version>
 
         <!-- Database images for JDBC/Reactive/Hibernate tests and devservices -->
         <postgres.image>docker.io/library/postgres:17</postgres.image>

devtools/gradle/gradle/libs.versions.toml

@@ -4,7 +4,7 @@ plugin-publish = "2.0.0"
 kotlin = "2.2.21"
 smallrye-config = "3.14.1"
 
-junit5 = "5.13.4"
+junit5 = "6.0.1"
 assertj = "3.27.6"
 
 [plugins]

independent-projects/arc/pom.xml

@@ -53,7 +53,7 @@
         <version.smallrye-common>2.14.0</version.smallrye-common>
         <!-- test versions -->
         <version.assertj>3.27.6</version.assertj>
-        <version.junit5>5.13.4</version.junit5>
+        <version.junit5>6.0.1</version.junit5>
         <version.kotlin>2.2.21</version.kotlin>
         <version.kotlin-coroutines>1.10.2</version.kotlin-coroutines>
         <version.mockito>5.20.0</version.mockito>

independent-projects/bootstrap/pom.xml

@@ -40,7 +40,7 @@
         <assertj.version>3.27.6</assertj.version>
         <eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
         <jboss-logging.version>3.6.1.Final</jboss-logging.version>
-        <junit5.version>5.13.4</junit5.version>
+        <junit5.version>6.0.1</junit5.version>
         <maven-core.version>3.9.11</maven-core.version><!-- Keep in sync with sisu.version -->
         <sisu.version>0.9.0.M4</sisu.version><!-- Keep in sync with maven-core.version -->
         <maven-plugin-annotations.version>3.15.1</maven-plugin-annotations.version>

independent-projects/extension-maven-plugin/pom.xml

@@ -39,7 +39,7 @@
         <maven-core.version>3.9.11</maven-core.version>
         <jackson-bom.version>2.20.1</jackson-bom.version>
         <smallrye-beanbag.version>1.5.3</smallrye-beanbag.version>
-        <junit5.version>5.13.4</junit5.version>
+        <junit5.version>6.0.1</junit5.version>
         <mockito.version>5.20.0</mockito.version>
     </properties>
     <build>

independent-projects/junit5-virtual-threads/pom.xml

@@ -44,7 +44,7 @@
         <jandex.version>3.5.3</jandex.version>
         <smallrye-common.version>2.14.0</smallrye-common.version>
 
-        <junit5.version>5.13.4</junit5.version>
+        <junit5.version>6.0.1</junit5.version>
         <assertj.version>3.27.6</assertj.version>
     </properties>
 

independent-projects/junit5-virtual-threads/src/test/java/io/quarkus/test/junit5/virtual/internal/VirtualThreadExtensionTest.java

@@ -13,6 +13,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -195,20 +196,25 @@ public Optional<String> getConfigurationParameter(String s) {
         }
 
         @Override
-        public <T> Optional<T> getConfigurationParameter(String s, Function<String, T> function) {
+        public <T> Optional<T> getConfigurationParameter(String key,
+                Function<? super String, ? extends @Nullable T> transformer) {
             return Optional.empty();
         }
 
         @Override
         public void publishReportEntry(Map<String, String> map) {
-
         }
 
         @Override
         public TestStore getStore(Namespace namespace) {
             return store;
         }
 
+        @Override
+        public Store getStore(StoreScope scope, Namespace namespace) {
+            return store;
+        }
+
         @Override
         public ExecutionMode getExecutionMode() {
             return ExecutionMode.SAME_THREAD;
@@ -229,12 +235,11 @@ public void publishFile(String name, MediaType mediaType, ThrowingConsumer<Path>
         }
 
         @Override
-        public void publishDirectory(String name, ThrowingConsumer<Path> action) {
+        public void publishFile(String name, org.junit.jupiter.api.MediaType mediaType, ThrowingConsumer<Path> action) {
         }
 
         @Override
-        public Store getStore(StoreScope scope, Namespace namespace) {
-            return null;
+        public void publishDirectory(String name, ThrowingConsumer<Path> action) {
         }
     }
 
@@ -276,15 +281,29 @@ public <V> V get(Object o, Class<V> aClass) {
         }
 
         @Override
-        @SuppressWarnings("unchecked")
-        public <K, V> Object getOrComputeIfAbsent(K key, Function<K, V> function) {
-            return store.computeIfAbsent(key, o -> function.apply((K) o));
+        public <V> V getOrDefault(Object key, Class<V> requiredType, V defaultValue) {
+            return requiredType.cast(store.getOrDefault(key, defaultValue));
         }
 
         @Override
-        @SuppressWarnings("unchecked")
-        public <K, V> V getOrComputeIfAbsent(K key, Function<K, V> function, Class<V> aClass) {
-            return aClass.cast(store.computeIfAbsent(key, o -> function.apply((K) o)));
+        public @Nullable <K, V> Object getOrComputeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator) {
+            return store.computeIfAbsent(key, o -> defaultCreator.apply((K) o));
+        }
+
+        @Override
+        public <K, V> Object computeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator) {
+            return store.computeIfAbsent(key, o -> defaultCreator.apply((K) o));
+        }
+
+        @Override
+        public <K, V> @Nullable V getOrComputeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator,
+                Class<V> requiredType) {
+            return requiredType.cast(store.computeIfAbsent(key, o -> defaultCreator.apply((K) o)));
+        }
+
+        @Override
+        public <K, V> V computeIfAbsent(K key, Function<? super K, ? extends V> defaultCreator, Class<V> requiredType) {
+            return requiredType.cast(store.computeIfAbsent(key, o -> defaultCreator.apply((K) o)));
         }
 
         @Override

independent-projects/qute/pom.xml

@@ -38,7 +38,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.junit>5.13.4</version.junit>
+        <version.junit>6.0.1</version.junit>
         <version.assertj>3.27.6</version.assertj>
         <version.jandex>3.5.3</version.jandex>
         <version.gizmo2>2.0.0.Beta10</version.gizmo2>

independent-projects/resteasy-reactive/pom.xml

@@ -46,7 +46,7 @@
         <jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
         <jandex.version>3.5.3</jandex.version>
         <bytebuddy.version>1.17.6</bytebuddy.version>
-        <junit5.version>5.13.4</junit5.version>
+        <junit5.version>6.0.1</junit5.version>
         <maven.version>3.9.11</maven.version>
         <assertj.version>3.27.6</assertj.version>
         <jboss-logging.version>3.6.1.Final</jboss-logging.version>