diff --git a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts index 71153f442189..fbc8cf09056a 100644 --- a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts +++ b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts @@ -47,26 +47,6 @@ graalvmNative { binaries.all { resources.autodetect() - - // see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13 - // should not be needed after updating native build tools to 0.11.0 - val initializeAtBuildTime = listOf( - "org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods", - "org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor", - "org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor", - "org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode", - "org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1", - "org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo", - "org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext", - "org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue", - "org.junit.platform.launcher.core.DiscoveryIssueNotifier", - "org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider", - "org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo", - "org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods", - ) - buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}") } // See https://github.com/graalvm/native-build-tools/issues/572 diff --git a/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts index ea5c0e71c9bc..0f1ccf155b0a 100644 --- a/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts @@ -75,28 +75,4 @@ graalvmNative { useJUnitPlatform() setForkEvery(1) } - - // see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13 - // should not be needed after updating native build tools to 0.11.0 - val initializeAtBuildTime = listOf( - "org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods", - "org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor", - "org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor", - "org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode", - "org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1", - "org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo", - "org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext", - "org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue", - "org.junit.platform.launcher.core.DiscoveryIssueNotifier", - "org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider", - "org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo", - "org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods", - ) - binaries { - named("test") { - buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}") - } - } } diff --git a/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts index 9671dc8bcc43..1b7b865e7b7d 100644 --- a/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-3/build.gradle.kts @@ -78,28 +78,4 @@ graalvmNative { useJUnitPlatform() setForkEvery(1) } - - // see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13 - // should not be needed after updating native build tools to 0.11.0 - val initializeAtBuildTime = listOf( - "org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods", - "org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor", - "org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor", - "org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode", - "org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1", - "org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo", - "org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext", - "org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue", - "org.junit.platform.launcher.core.DiscoveryIssueNotifier", - "org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider", - "org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo", - "org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods", - ) - binaries { - named("test") { - buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}") - } - } } diff --git a/smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts index 71e0daffc54b..64049fbe61fb 100644 --- a/smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts @@ -69,28 +69,4 @@ graalvmNative { useJUnitPlatform() setForkEvery(1) } - - // see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13 - // should not be needed after updating native build tools to 0.11.0 - val initializeAtBuildTime = listOf( - "org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo", - "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods", - "org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor", - "org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor", - "org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode", - "org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1", - "org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo", - "org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext", - "org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue", - "org.junit.platform.launcher.core.DiscoveryIssueNotifier", - "org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider", - "org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo", - "org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods", - ) - binaries { - named("test") { - buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}") - } - } }