Update dependency org.junit:junit-bom to v5.12.0

build-tools-integration-tests/build.gradle

@@ -35,7 +35,7 @@ dependencies {
   implementation("org.projectnessie.nessie:nessie-versioned-storage-store")
   implementation("org.projectnessie.nessie:nessie-versioned-storage-testextension")
 
-  testImplementation(platform("org.junit:junit-bom:5.11.4"))
+  testImplementation(platform("org.junit:junit-bom:5.12.0"))
   testImplementation("org.junit.jupiter:junit-jupiter-api")
   testImplementation("org.junit.jupiter:junit-jupiter-params")
   testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")

build-tools-integration-tests/pom.xml

@@ -42,7 +42,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.11.4</version>
+        <version>5.12.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

gradle/baselibs.versions.toml

@@ -5,7 +5,7 @@ assertj-core = { module = "org.assertj:assertj-core", version = "3.27.3" }
 errorprone = { module = "net.ltgt.gradle:gradle-errorprone-plugin", version = "4.1.0" }
 idea-ext = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version = "1.1.10" }
 jandex = { module = "com.github.vlsi.gradle:jandex-plugin", version = "1.90" }
-junit-bom = { module = "org.junit:junit-bom", version = "5.11.4" }
+junit-bom = { module = "org.junit:junit-bom", version = "5.12.0" }
 license-report = { module = "com.github.jk1:gradle-license-report", version = "2.9" }
 shadow = { module = "com.gradleup.shadow:shadow-gradle-plugin", version = "8.3.6" }
 spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "7.0.2" }

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ iceberg = "1.8.0" # While bumping this version, 'nessieClientVersion' must also
 immutables = "2.10.1"
 jandex = "3.1.8"
 jmh = "1.37"
-junit = "5.11.4"
+junit = "5.12.0"
 kafka = "3.9.0"
 keycloak = "26.0.4"
 logback = "1.5.16"

testing/multi-env-test-engine/src/main/java/org/projectnessie/junit/engine/JUnitCompat.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2025 Dremio
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.projectnessie.junit.engine;
+
+import org.junit.jupiter.engine.config.DefaultJupiterConfiguration;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.platform.engine.ConfigurationParameters;
+import org.junit.platform.engine.EngineDiscoveryRequest;
+import org.junit.platform.engine.reporting.OutputDirectoryProvider;
+
+final class JUnitCompat {
+  private JUnitCompat() {}
+
+  static Class<?> CLASS_OUTPUT_DIRECTORY_PROVIDER;
+
+  static {
+    try {
+      CLASS_OUTPUT_DIRECTORY_PROVIDER =
+          Class.forName("org.junit.platform.engine.reporting.OutputDirectoryProvider");
+    } catch (ClassNotFoundException e) {
+      CLASS_OUTPUT_DIRECTORY_PROVIDER = null;
+    }
+  }
+
+  static JupiterConfiguration newDefaultJupiterConfiguration(EngineDiscoveryRequest request) {
+    return newDefaultJupiterConfiguration(request.getConfigurationParameters(), request);
+  }
+
+  static JupiterConfiguration newDefaultJupiterConfiguration(
+      ConfigurationParameters configurationParameters, EngineDiscoveryRequest request) {
+    try {
+      if (CLASS_OUTPUT_DIRECTORY_PROVIDER != null) {
+        return newDefaultJupiterConfiguration512(configurationParameters, request);
+      }
+
+      var ctorBefore512 =
+          DefaultJupiterConfiguration.class.getDeclaredConstructor(ConfigurationParameters.class);
+      return ctorBefore512.newInstance(configurationParameters);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private static JupiterConfiguration newDefaultJupiterConfiguration512(
+      ConfigurationParameters configurationParameters, EngineDiscoveryRequest request)
+      throws Exception {
+    var ctorSince512 =
+        DefaultJupiterConfiguration.class.getDeclaredConstructor(
+            ConfigurationParameters.class, OutputDirectoryProvider.class);
+    return ctorSince512.newInstance(configurationParameters, request.getOutputDirectoryProvider());
+  }
+}

testing/multi-env-test-engine/src/main/java/org/projectnessie/junit/engine/MultiEnvDelegatingJupiterConfiguration.java

@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2023 Dremio
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.projectnessie.junit.engine;
+
+import static org.projectnessie.junit.engine.JUnitCompat.newDefaultJupiterConfiguration;
+
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.TestInstantiationAwareExtension;
+import org.junit.jupiter.api.io.CleanupMode;
+import org.junit.jupiter.api.io.TempDirFactory;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.engine.config.JupiterConfiguration;
+import org.junit.platform.engine.EngineDiscoveryRequest;
+import org.junit.platform.engine.reporting.OutputDirectoryProvider;
+
+public class MultiEnvDelegatingJupiterConfiguration implements JupiterConfiguration {
+
+  final JupiterConfiguration delegate;
+
+  public MultiEnvDelegatingJupiterConfiguration(EngineDiscoveryRequest discoveryRequest) {
+    this.delegate = newDefaultJupiterConfiguration(discoveryRequest);
+  }
+
+  @Override
+  public DisplayNameGenerator getDefaultDisplayNameGenerator() {
+    return delegate.getDefaultDisplayNameGenerator();
+  }
+
+  @Override
+  public Predicate<Class<? extends Extension>> getFilterForAutoDetectedExtensions() {
+    return delegate.getFilterForAutoDetectedExtensions();
+  }
+
+  @Override
+  public Optional<String> getRawConfigurationParameter(String key) {
+    return delegate.getRawConfigurationParameter(key);
+  }
+
+  @Override
+  public <T> Optional<T> getRawConfigurationParameter(String key, Function<String, T> transformer) {
+    return delegate.getRawConfigurationParameter(key, transformer);
+  }
+
+  @Override
+  public boolean isParallelExecutionEnabled() {
+    return delegate.isParallelExecutionEnabled();
+  }
+
+  @Override
+  public boolean isExtensionAutoDetectionEnabled() {
+    return delegate.isExtensionAutoDetectionEnabled();
+  }
+
+  @Override
+  public boolean isThreadDumpOnTimeoutEnabled() {
+    return delegate.isThreadDumpOnTimeoutEnabled();
+  }
+
+  @Override
+  public ExecutionMode getDefaultExecutionMode() {
+    return delegate.getDefaultExecutionMode();
+  }
+
+  @Override
+  public ExecutionMode getDefaultClassesExecutionMode() {
+    return delegate.getDefaultClassesExecutionMode();
+  }
+
+  @Override
+  public TestInstance.Lifecycle getDefaultTestInstanceLifecycle() {
+    return delegate.getDefaultTestInstanceLifecycle();
+  }
+
+  @Override
+  public Predicate<ExecutionCondition> getExecutionConditionFilter() {
+    return delegate.getExecutionConditionFilter();
+  }
+
+  @Override
+  public Optional<MethodOrderer> getDefaultTestMethodOrderer() {
+    return delegate.getDefaultTestMethodOrderer();
+  }
+
+  @Override
+  public Optional<ClassOrderer> getDefaultTestClassOrderer() {
+    return delegate.getDefaultTestClassOrderer();
+  }
+
+  @Override
+  public CleanupMode getDefaultTempDirCleanupMode() {
+    return delegate.getDefaultTempDirCleanupMode();
+  }
+
+  @Override
+  public Supplier<TempDirFactory> getDefaultTempDirFactorySupplier() {
+    return delegate.getDefaultTempDirFactorySupplier();
+  }
+
+  @Override
+  public TestInstantiationAwareExtension.ExtensionContextScope
+      getDefaultTestInstantiationExtensionContextScope() {
+    return delegate.getDefaultTestInstantiationExtensionContextScope();
+  }
+
+  @Override
+  public OutputDirectoryProvider getOutputDirectoryProvider() {
+    return delegate.getOutputDirectoryProvider();
+  }
+}

testing/multi-env-test-engine/src/main/java/org/projectnessie/junit/engine/MultiEnvDisplayNameGenerator.java

@@ -16,6 +16,7 @@
 package org.projectnessie.junit.engine;
 
 import java.lang.reflect.Method;
+import java.util.List;
 import org.junit.jupiter.api.DisplayNameGenerator;
 
 public class MultiEnvDisplayNameGenerator implements DisplayNameGenerator {
@@ -33,13 +34,33 @@ public String generateDisplayNameForClass(Class<?> testClass) {
     return delegate.generateDisplayNameForClass(testClass) + " [" + environment + "]";
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public String generateDisplayNameForNestedClass(Class<?> nestedClass) {
     return delegate.generateDisplayNameForNestedClass(nestedClass) + " [" + environment + "]";
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public String generateDisplayNameForMethod(Class<?> testClass, Method testMethod) {
     return delegate.generateDisplayNameForMethod(testClass, testMethod) + " [" + environment + "]";
   }
+
+  @Override
+  public String generateDisplayNameForNestedClass(
+      List<Class<?>> enclosingInstanceTypes, Class<?> nestedClass) {
+    return delegate.generateDisplayNameForNestedClass(enclosingInstanceTypes, nestedClass)
+        + " ["
+        + environment
+        + "]";
+  }
+
+  @Override
+  public String generateDisplayNameForMethod(
+      List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod) {
+    return delegate.generateDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod)
+        + " ["
+        + environment
+        + "]";
+  }
 }

testing/multi-env-test-engine/src/main/java/org/projectnessie/junit/engine/MultiEnvExtensionRegistry.java

@@ -15,6 +15,8 @@
  */
 package org.projectnessie.junit.engine;
 
+import static org.projectnessie.junit.engine.JUnitCompat.newDefaultJupiterConfiguration;
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -23,10 +25,10 @@
 import java.util.stream.Stream;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.Extension;
-import org.junit.jupiter.engine.config.DefaultJupiterConfiguration;
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
 import org.junit.jupiter.engine.extension.MutableExtensionRegistry;
 import org.junit.platform.commons.util.AnnotationUtils;
+import org.junit.platform.engine.EngineDiscoveryRequest;
 
 /**
  * A helper class for collecting instances of {@link MultiEnvTestExtension}.
@@ -39,10 +41,10 @@ public class MultiEnvExtensionRegistry {
 
   private final Set<ClassBasedTestDescriptor> probablyNotMultiEnv = new LinkedHashSet<>();
 
-  public MultiEnvExtensionRegistry() {
+  public MultiEnvExtensionRegistry(EngineDiscoveryRequest discoveryRequest) {
     this.registry =
         MutableExtensionRegistry.createRegistryWithDefaultExtensions(
-            new DefaultJupiterConfiguration(new EmptyConfigurationParameters()));
+            newDefaultJupiterConfiguration(new EmptyConfigurationParameters(), discoveryRequest));
   }
 
   public void registerExtensions(ClassBasedTestDescriptor descriptor) {

testing/multi-env-test-engine/src/main/java/org/projectnessie/junit/engine/MultiEnvJupiterConfiguration.java

@@ -16,22 +16,20 @@
 package org.projectnessie.junit.engine;
 
 import org.junit.jupiter.api.DisplayNameGenerator;
-import org.junit.jupiter.engine.config.DefaultJupiterConfiguration;
-import org.junit.platform.engine.ConfigurationParameters;
+import org.junit.platform.engine.EngineDiscoveryRequest;
 
-public class MultiEnvJupiterConfiguration extends DefaultJupiterConfiguration {
+public class MultiEnvJupiterConfiguration extends MultiEnvDelegatingJupiterConfiguration {
 
   private final String environment;
 
-  public MultiEnvJupiterConfiguration(
-      ConfigurationParameters configurationParameters, String environment) {
-    super(configurationParameters);
+  public MultiEnvJupiterConfiguration(EngineDiscoveryRequest discoveryRequest, String environment) {
+    super(discoveryRequest);
     this.environment = environment;
   }
 
   @Override
   public DisplayNameGenerator getDefaultDisplayNameGenerator() {
-    DisplayNameGenerator delegate = super.getDefaultDisplayNameGenerator();
+    DisplayNameGenerator delegate = super.delegate.getDefaultDisplayNameGenerator();
     return new MultiEnvDisplayNameGenerator(delegate, environment);
   }
 }