diff --git a/integration-tests/graal-incubating/build.gradle.kts b/integration-tests/graal-incubating/build.gradle.kts index c30cb597f2d..7d60ec0ad3a 100644 --- a/integration-tests/graal-incubating/build.gradle.kts +++ b/integration-tests/graal-incubating/build.gradle.kts @@ -7,7 +7,7 @@ plugins { description = "OpenTelemetry Graal Integration Tests (Incubating)" otelJava.moduleName.set("io.opentelemetry.graal.integration.tests.incubating") -otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11) +otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17) sourceSets { main { @@ -26,33 +26,13 @@ dependencies { implementation(project(":api:incubator")) } -// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26 +// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.0 // https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc graalvmNative { binaries { named("test") { - // Required as of junit 5.10.0: https://junit.org/junit5/docs/5.10.0/release-notes/#deprecations-and-breaking-changes - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter") - // Required as of junit 5.13.0: https://junit.org/junit5/docs/5.13.0/release-notes/#deprecations-and-breaking-changes - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext") - buildArgs.add("--initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherPhase") - buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.DiscoverySelectorResolver") - buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$DiscoveryIssueForwardingListener") - buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods") + // JUnit initialization is now handled automatically by the GraalVM plugin 0.11+ } } toolchainDetection.set(false) diff --git a/integration-tests/graal/build.gradle.kts b/integration-tests/graal/build.gradle.kts index 4086a91e778..d2ac75674db 100644 --- a/integration-tests/graal/build.gradle.kts +++ b/integration-tests/graal/build.gradle.kts @@ -7,7 +7,7 @@ plugins { description = "OpenTelemetry Graal Integration Tests" otelJava.moduleName.set("io.opentelemetry.graal.integration.tests") -otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11) +otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17) sourceSets { main { @@ -24,33 +24,13 @@ dependencies { implementation(project(":exporters:otlp:all")) } -// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26 +// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.0 // https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc graalvmNative { binaries { named("test") { - // Required as of junit 5.10.0: https://junit.org/junit5/docs/5.10.0/release-notes/#deprecations-and-breaking-changes - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter") - // Required as of junit 5.13.0: https://junit.org/junit5/docs/5.13.0/release-notes/#deprecations-and-breaking-changes - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo") - buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext") - buildArgs.add("--initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo") - buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherPhase") - buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.DiscoverySelectorResolver") - buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$DiscoveryIssueForwardingListener") - buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods") + // JUnit initialization is now handled automatically by the GraalVM plugin 0.11+ } } toolchainDetection.set(false) diff --git a/settings.gradle.kts b/settings.gradle.kts index cb59909198b..5fddc36000d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { id("de.undercouch.download") version "5.6.0" id("org.jsonschema2pojo") version "1.2.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("org.graalvm.buildtools.native") version "0.10.6" + id("org.graalvm.buildtools.native") version "0.11.3" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } }