Skip to content

Commit d73c5b1

Browse files
authored
Update graalvm buildtools (#7858)
1 parent 3777666 commit d73c5b1

File tree

3 files changed

+7
-47
lines changed

3 files changed

+7
-47
lines changed

integration-tests/graal-incubating/build.gradle.kts

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
description = "OpenTelemetry Graal Integration Tests (Incubating)"
99
otelJava.moduleName.set("io.opentelemetry.graal.integration.tests.incubating")
10-
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11)
10+
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)
1111

1212
sourceSets {
1313
main {
@@ -26,33 +26,13 @@ dependencies {
2626
implementation(project(":api:incubator"))
2727
}
2828

29-
// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26
29+
// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.0
3030
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
3131

3232
graalvmNative {
3333
binaries {
3434
named("test") {
35-
// Required as of junit 5.10.0: https://junit.org/junit5/docs/5.10.0/release-notes/#deprecations-and-breaking-changes
36-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
37-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter")
38-
// Required as of junit 5.13.0: https://junit.org/junit5/docs/5.13.0/release-notes/#deprecations-and-breaking-changes
39-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences")
40-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo")
41-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods")
42-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor")
43-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor")
44-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode")
45-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1")
46-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo")
47-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext")
48-
buildArgs.add("--initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue")
49-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier")
50-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider")
51-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo")
52-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherPhase")
53-
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.DiscoverySelectorResolver")
54-
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$DiscoveryIssueForwardingListener")
55-
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods")
35+
// JUnit initialization is now handled automatically by the GraalVM plugin 0.11+
5636
}
5737
}
5838
toolchainDetection.set(false)

integration-tests/graal/build.gradle.kts

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
description = "OpenTelemetry Graal Integration Tests"
99
otelJava.moduleName.set("io.opentelemetry.graal.integration.tests")
10-
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11)
10+
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)
1111

1212
sourceSets {
1313
main {
@@ -24,33 +24,13 @@ dependencies {
2424
implementation(project(":exporters:otlp:all"))
2525
}
2626

27-
// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26
27+
// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.0
2828
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
2929

3030
graalvmNative {
3131
binaries {
3232
named("test") {
33-
// Required as of junit 5.10.0: https://junit.org/junit5/docs/5.10.0/release-notes/#deprecations-and-breaking-changes
34-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
35-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter")
36-
// Required as of junit 5.13.0: https://junit.org/junit5/docs/5.13.0/release-notes/#deprecations-and-breaking-changes
37-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences")
38-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo")
39-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods")
40-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor")
41-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor")
42-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode")
43-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1")
44-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo")
45-
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext")
46-
buildArgs.add("--initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue")
47-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier")
48-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider")
49-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo")
50-
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherPhase")
51-
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.DiscoverySelectorResolver")
52-
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$DiscoveryIssueForwardingListener")
53-
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods")
33+
// JUnit initialization is now handled automatically by the GraalVM plugin 0.11+
5434
}
5535
}
5636
toolchainDetection.set(false)

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
id("de.undercouch.download") version "5.6.0"
66
id("org.jsonschema2pojo") version "1.2.2"
77
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
8-
id("org.graalvm.buildtools.native") version "0.10.6"
8+
id("org.graalvm.buildtools.native") version "0.11.3"
99
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
1010
}
1111
}

0 commit comments

Comments
 (0)