Avoid Adding Duplicated JUnit Entries on Classpath

common/junit-platform-native/build.gradle

@@ -52,12 +52,16 @@ maven {
 }
 dependencies {
     compileOnly libs.graalvm.svm
-    implementation(platform(libs.test.junit.bom))
-    implementation libs.test.junit.platform.console
-    implementation libs.test.junit.platform.launcher
-    implementation libs.test.junit.jupiter.core
+    compileOnly(platform(libs.test.junit.bom))
+    compileOnly libs.test.junit.platform.console
+    compileOnly libs.test.junit.platform.launcher
+    compileOnly libs.test.junit.jupiter.core
     testImplementation libs.test.junit.vintage
+
+    testRuntimeOnly(platform(libs.test.junit.bom))
+    testRuntimeOnly libs.test.junit.platform.console
     testRuntimeOnly libs.test.junit.platform.launcher
+    testRuntimeOnly libs.test.junit.jupiter.core
 }
 
 apply from: "gradle/native-image-testing.gradle"

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/JUnitPlatformFeature.java

@@ -264,7 +264,13 @@ private static void initializeClassesForJDK21OrEarlier() {
         try (InputStream is = JUnitPlatformFeature.class.getResourceAsStream("/initialize-at-buildtime")) {
             if (is != null) {
                 try (BufferedReader br = new BufferedReader(new InputStreamReader(is))) {
-                    br.lines().forEach(RuntimeClassInitialization::initializeAtBuildTime);
+                    br.lines().forEach(cls -> {
+                        try {
+                            RuntimeClassInitialization.initializeAtBuildTime(cls);
+                        } catch (NoClassDefFoundError e) {
+                            // if users use older JUnit versions some classes might not be available
+                        }
+                    });
                 }
             }
         } catch (IOException e) {

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/NativeImageJUnitLauncher.java

@@ -123,12 +123,12 @@ public static void main(String... args) {
             out.println("JUnit Platform on Native Image - report");
             out.println("----------------------------------------\n");
             out.flush();
-            launcher.registerTestExecutionListeners(new PrintTestExecutionListener(out));
+            configurePrintTestExecutionListener(launcher, out);
         }
 
         SummaryGeneratingListener summaryListener = new SummaryGeneratingListener();
         launcher.registerTestExecutionListeners(summaryListener);
-        launcher.registerTestExecutionListeners(new LegacyXmlReportGeneratingListener(Paths.get(xmlOutput), out));
+        configureLegacyXMLReport(launcher, xmlOutput, out);
         launcher.execute(testPlan);
 
         TestExecutionSummary summary = summaryListener.getSummary();
@@ -271,4 +271,21 @@ private static boolean testIdsDirectoryExists(Path directory) {
         return directory != null && Files.exists(directory);
     }
 
+
+    private static void configurePrintTestExecutionListener(Launcher launcher, PrintWriter out) {
+        try {
+            Class.forName("org.junit.platform.reporting.legacy.LegacyReportingUtils");
+            launcher.registerTestExecutionListeners(new PrintTestExecutionListener(out));
+        } catch (NoClassDefFoundError | ClassNotFoundException e) {
+            // intentionally ignored
+        }
+    }
+
+    private static void configureLegacyXMLReport(Launcher launcher, String xmlOutput, PrintWriter out) {
+        try {
+            launcher.registerTestExecutionListeners(new LegacyXmlReportGeneratingListener(Paths.get(xmlOutput), out));
+        } catch (NoClassDefFoundError e) {
+            // intentionally ignored
+        }
+    }
 }

common/junit-platform-native/src/main/java/org/graalvm/junit/platform/config/jupiter/JupiterConfigProvider.java

@@ -54,8 +54,8 @@
 import org.junit.jupiter.params.converter.ConvertWith;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.MethodSource;
 import org.junit.jupiter.params.provider.FieldSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -86,9 +86,15 @@ public void onTestClassRegistered(Class<?> testClass, NativeImageConfiguration r
         AnnotationUtils.forEachAnnotatedMethodParameter(testClass, AggregateWith.class, annotation -> registry.registerAllClassMembersForReflection(annotation.value()));
         AnnotationUtils.forEachAnnotatedMethod(testClass, EnumSource.class, (m, annotation) -> handleEnumSource(m, annotation, registry));
         AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, MethodSource.class, JupiterConfigProvider::handleMethodSource);
-        AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, FieldSource.class, JupiterConfigProvider::handleFieldSource);
         AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, EnabledIf.class, JupiterConfigProvider::handleEnabledIf);
         AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, DisabledIf.class, JupiterConfigProvider::handleDisabledIf);
+
+        try {
+            AnnotationUtils.registerClassesFromAnnotationForReflection(testClass, registry, FieldSource.class, JupiterConfigProvider::handleFieldSource);
+        } catch (NoClassDefFoundError e) {
+            // if users use JUnit version older than 5.11, FieldSource class won't be available
+        }
+
     }
 
     private static Class<?>[] handleMethodSource(MethodSource annotation) {

common/junit-platform-native/src/main/resources/initialize-at-buildtime

@@ -46,6 +46,7 @@ org.junit.jupiter.engine.discovery.MethodSelectorResolver$MethodType$3
 org.junit.jupiter.engine.discovery.predicates.IsTestClassWithTests
 org.junit.jupiter.engine.discovery.predicates.IsTestFactoryMethod
 org.junit.jupiter.engine.execution.ConditionEvaluator
+org.junit.jupiter.engine.execution.ExecutableInvoker
 org.junit.jupiter.engine.execution.InterceptingExecutableInvoker
 org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall
 org.junit.jupiter.engine.execution.InterceptingExecutableInvoker$ReflectiveInterceptorCall$VoidMethodInterceptorCall
@@ -78,6 +79,7 @@ org.junit.platform.launcher.core.DiscoveryIssueNotifier
 org.junit.platform.launcher.core.EngineDiscoveryOrchestrator
 org.junit.platform.launcher.core.EngineExecutionOrchestrator
 org.junit.platform.launcher.core.EngineFilterer
+org.junit.platform.launcher.core.EngineIdValidator
 org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider
 org.junit.platform.launcher.core.InternalTestPlan
 org.junit.platform.launcher.core.LauncherConfig
@@ -90,6 +92,8 @@ org.junit.platform.launcher.core.LauncherDiscoveryResult
 org.junit.platform.launcher.core.LauncherDiscoveryResult$EngineResultInfo
 org.junit.platform.launcher.core.LauncherListenerRegistry
 org.junit.platform.launcher.core.ListenerRegistry
+org.junit.platform.launcher.core.ServiceLoaderRegistry
+org.junit.platform.launcher.core.ServiceLoaderTestEngineRegistry
 org.junit.platform.launcher.core.SessionPerRequestLauncher
 org.junit.platform.launcher.EngineDiscoveryResult
 org.junit.platform.launcher.LauncherSessionListener$1

native-maven-plugin/reproducers/issue-144/pom.xml

@@ -69,6 +69,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

native-maven-plugin/src/main/java/org/graalvm/buildtools/maven/NativeTestMojo.java

@@ -60,7 +60,6 @@
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResolutionException;
 import org.eclipse.aether.resolution.DependencyResult;
-import org.graalvm.buildtools.utils.FileUtils;
 import org.graalvm.buildtools.utils.JUnitUtils;
 import org.graalvm.buildtools.utils.NativeImageConfigurationUtils;
 
@@ -76,7 +75,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 

samples/java-application-with-custom-tests/build.gradle

@@ -68,6 +68,8 @@ dependencies {
     testImplementation(platform("org.junit:junit-bom:${junitVersion}"))
     testImplementation('org.junit.jupiter:junit-jupiter')
     integTestImplementation project(":")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-reporting:1.11.0")
 }
 
 def integTest = tasks.register("integTest", Test) {

samples/java-application-with-reflection/build.gradle

@@ -58,6 +58,7 @@ def junitVersion = providers.gradleProperty('junit.jupiter.version')
 dependencies {
     testImplementation(platform("org.junit:junit-bom:${junitVersion}"))
     testImplementation('org.junit.jupiter:junit-jupiter')
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
 }
 
 test {

samples/java-application-with-reflection/pom.xml

@@ -65,6 +65,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

samples/java-application-with-resources/build.gradle

@@ -58,6 +58,7 @@ def junitVersion = providers.gradleProperty('junit.jupiter.version')
 dependencies {
     testImplementation(platform("org.junit:junit-bom:${junitVersion}"))
     testImplementation('org.junit.jupiter:junit-jupiter')
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
 }
 
 test {

samples/java-application-with-resources/pom.xml

@@ -70,6 +70,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

samples/java-application-with-tests/build.gradle

@@ -58,6 +58,8 @@ def junitVersion = providers.gradleProperty('junit.jupiter.version')
 dependencies {
     testImplementation(platform("org.junit:junit-bom:${junitVersion}"))
     testImplementation('org.junit.jupiter:junit-jupiter')
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-reporting:1.11.0")
 }
 
 test {

samples/java-application-with-tests/pom.xml

@@ -71,6 +71,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

samples/java-library/build.gradle

@@ -54,6 +54,7 @@ def junitVersion = providers.gradleProperty('junit.jupiter.version')
 dependencies {
     testImplementation(platform("org.junit:junit-bom:${junitVersion}"))
     testImplementation('org.junit.jupiter:junit-jupiter')
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
 }
 
 graalvmNative {

samples/java-library/pom.xml

@@ -63,6 +63,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>

samples/junit-tests/build.gradle

@@ -51,6 +51,7 @@ repositories {
 dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
     testImplementation "org.junit.vintage:junit-vintage-engine:5.11.0"
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
 }
 
 application {

samples/junit-tests/pom.xml

@@ -64,6 +64,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.11.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>

samples/kotlin-application-with-tests/build.gradle

@@ -54,6 +54,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
     testImplementation 'org.jetbrains.kotlin:kotlin-test'
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
 }
 
 application {

samples/multi-project-with-tests/core/build.gradle

@@ -59,6 +59,7 @@ dependencies {
     implementation(project(":utils"))
     testImplementation(platform("org.junit:junit-bom:${junitVersion}"))
     testImplementation('org.junit.jupiter:junit-jupiter')
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
 }
 
 test {

samples/multi-project-with-tests/pom.xml

@@ -71,6 +71,12 @@
             <version>${junit.jupiter.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.11.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>