Skip to content

Commit e6f7a10

Browse files
Duncan-tree-zhouDuncan-tree-zhou
authored
Merge branch 'main' into add_metric_annotation_instrument
2 parents 00b5577 + f9d37ac commit e6f7a10

File tree

4 files changed

+0
-92
lines changed

4 files changed

+0
-92
lines changed

‎instrumentation/logback/logback-appender-1.0/library/build.gradle.kts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,6 @@ graalvmNative {
4747

4848
binaries.all {
4949
resources.autodetect()
50-
51-
// see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13
52-
// should not be needed after updating native build tools to 0.11.0
53-
val initializeAtBuildTime = listOf(
54-
"org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences",
55-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo",
56-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods",
57-
"org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor",
58-
"org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor",
59-
"org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode",
60-
"org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1",
61-
"org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo",
62-
"org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext",
63-
"org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue",
64-
"org.junit.platform.launcher.core.DiscoveryIssueNotifier",
65-
"org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider",
66-
"org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo",
67-
"org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods",
68-
)
69-
buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}")
7050
}
7151

7252
// See https://github.com/graalvm/native-build-tools/issues/572

‎smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,4 @@ graalvmNative {
7575
useJUnitPlatform()
7676
setForkEvery(1)
7777
}
78-
79-
// see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13
80-
// should not be needed after updating native build tools to 0.11.0
81-
val initializeAtBuildTime = listOf(
82-
"org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences",
83-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo",
84-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods",
85-
"org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor",
86-
"org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor",
87-
"org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode",
88-
"org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1",
89-
"org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo",
90-
"org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext",
91-
"org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue",
92-
"org.junit.platform.launcher.core.DiscoveryIssueNotifier",
93-
"org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider",
94-
"org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo",
95-
"org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods",
96-
)
97-
binaries {
98-
named("test") {
99-
buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}")
100-
}
101-
}
10278
}

‎smoke-tests-otel-starter/spring-boot-3/build.gradle.kts‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,4 @@ graalvmNative {
7878
useJUnitPlatform()
7979
setForkEvery(1)
8080
}
81-
82-
// see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13
83-
// should not be needed after updating native build tools to 0.11.0
84-
val initializeAtBuildTime = listOf(
85-
"org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences",
86-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo",
87-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods",
88-
"org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor",
89-
"org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor",
90-
"org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode",
91-
"org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1",
92-
"org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo",
93-
"org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext",
94-
"org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue",
95-
"org.junit.platform.launcher.core.DiscoveryIssueNotifier",
96-
"org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider",
97-
"org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo",
98-
"org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods",
99-
)
100-
binaries {
101-
named("test") {
102-
buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}")
103-
}
104-
}
10581
}

‎smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,28 +69,4 @@ graalvmNative {
6969
useJUnitPlatform()
7070
setForkEvery(1)
7171
}
72-
73-
// see https://github.com/junit-team/junit5/wiki/Upgrading-to-JUnit-5.13
74-
// should not be needed after updating native build tools to 0.11.0
75-
val initializeAtBuildTime = listOf(
76-
"org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences",
77-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo",
78-
"org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods",
79-
"org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor",
80-
"org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor",
81-
"org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode",
82-
"org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1",
83-
"org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo",
84-
"org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext",
85-
"org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue",
86-
"org.junit.platform.launcher.core.DiscoveryIssueNotifier",
87-
"org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider",
88-
"org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo",
89-
"org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods",
90-
)
91-
binaries {
92-
named("test") {
93-
buildArgs.add("--initialize-at-build-time=${initializeAtBuildTime.joinToString(",")}")
94-
}
95-
}
9672
}

0 commit comments

Comments
 (0)