Skip to content

Commit 57580f5

Browse files
renovate[bot]breedx-splkjkwatson
authored
fix(deps): update junit-framework monorepo to v5.13.2 (#7462)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jason Plumb <[email protected]> Co-authored-by: John Watson <[email protected]>
1 parent 7781706 commit 57580f5

File tree

11 files changed

+63
-14
lines changed

11 files changed

+63
-14
lines changed

‎dependencyManagement/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ val slf4jVersion = "2.0.17"
3636
val opencensusVersion = "0.31.1"
3737
val prometheusServerVersion = "1.3.10"
3838
val armeriaVersion = "1.32.5"
39-
val junitVersion = "5.12.2"
39+
val junitVersion = "5.13.2"
4040

4141
val DEPENDENCIES = listOf(
4242
"org.junit.jupiter:junit-jupiter-api:${junitVersion}",

‎exporters/common/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ testing {
6666

6767
implementation("io.grpc:grpc-stub")
6868
implementation("io.grpc:grpc-netty")
69+
implementation("com.fasterxml.jackson.core:jackson-core")
6970
}
7071
}
7172
}

‎exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/metrics/LowAllocationMetricsRequestMarshalerTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.junit.jupiter.params.provider.Arguments;
5656
import org.junit.jupiter.params.provider.ArgumentsProvider;
5757
import org.junit.jupiter.params.provider.ArgumentsSource;
58+
import org.junit.jupiter.params.support.ParameterDeclarations;
5859

5960
class LowAllocationMetricsRequestMarshalerTest {
6061

@@ -225,7 +226,8 @@ private static Collection<MetricData> metrics(Consumer<MeterProvider> metricProd
225226

226227
private static class MetricsProvider implements ArgumentsProvider {
227228
@Override
228-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
229+
public Stream<? extends Arguments> provideArguments(
230+
ParameterDeclarations parameters, ExtensionContext context) {
229231
return Stream.of(
230232
arguments(
231233
named(
@@ -386,7 +388,8 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
386388

387389
private static class ExemplarProvider implements ArgumentsProvider {
388390
@Override
389-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
391+
public Stream<? extends Arguments> provideArguments(
392+
ParameterDeclarations parameters, ExtensionContext context) {
390393
SpanContext spanContext =
391394
SpanContext.create(
392395
"7b2e170db4df2d593ddb4ddf2ddf2d59",

‎exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractGrpcTelemetryExporterTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
import org.junit.jupiter.params.provider.ArgumentsProvider;
9999
import org.junit.jupiter.params.provider.ArgumentsSource;
100100
import org.junit.jupiter.params.provider.ValueSource;
101+
import org.junit.jupiter.params.support.ParameterDeclarations;
101102
import org.slf4j.event.Level;
102103
import org.slf4j.event.LoggingEvent;
103104

@@ -461,7 +462,8 @@ void clientTls(byte[] privateKey) throws Exception {
461462
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
462463
@Override
463464
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
464-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
465+
public Stream<? extends Arguments> provideArguments(
466+
ParameterDeclarations parameters, ExtensionContext context) throws Exception {
465467
return Stream.of(
466468
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
467469
arguments(named("DER", clientCertificate.privateKey().getEncoded())));

‎exporters/otlp/testing-internal/src/main/java/io/opentelemetry/exporter/otlp/testing/internal/AbstractHttpTelemetryExporterTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
import org.junit.jupiter.params.provider.ArgumentsProvider;
100100
import org.junit.jupiter.params.provider.ArgumentsSource;
101101
import org.junit.jupiter.params.provider.ValueSource;
102+
import org.junit.jupiter.params.support.ParameterDeclarations;
102103
import org.mockserver.integration.ClientAndServer;
103104
import org.slf4j.event.Level;
104105
import org.slf4j.event.LoggingEvent;
@@ -475,7 +476,8 @@ void clientTls(byte[] privateKey) throws Exception {
475476
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
476477
@Override
477478
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
478-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
479+
public Stream<? extends Arguments> provideArguments(
480+
ParameterDeclarations parameters, ExtensionContext context) throws Exception {
479481
return Stream.of(
480482
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
481483
arguments(named("DER", clientCertificate.privateKey().getEncoded())));

‎exporters/sender/jdk/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
implementation(project(":exporters:common"))
1111
implementation(project(":sdk:common"))
1212

13-
compileOnly("com.fasterxml.jackson.core:jackson-core")
13+
testImplementation("com.fasterxml.jackson.core:jackson-core")
1414
}
1515

1616
tasks {

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
implementation(project(":api:incubator"))
2424
}
2525

26-
// org.graalvm.buildtools.native pluging requires java 11+ as of version 0.9.26
26+
// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26
2727
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
2828
tasks {
2929
withType<JavaCompile>().configureEach {
@@ -43,6 +43,24 @@ graalvmNative {
4343
// Required as of junit 5.10.0: https://junit.org/junit5/docs/5.10.0/release-notes/#deprecations-and-breaking-changes
4444
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
4545
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter")
46+
// Required as of junit 5.13.0: https://junit.org/junit5/docs/5.13.0/release-notes/#deprecations-and-breaking-changes
47+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences")
48+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo")
49+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods")
50+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor")
51+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor")
52+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode")
53+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1")
54+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo")
55+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext")
56+
buildArgs.add("--initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue")
57+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier")
58+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider")
59+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo")
60+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherPhase")
61+
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.DiscoverySelectorResolver")
62+
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$DiscoveryIssueForwardingListener")
63+
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods")
4664
}
4765
}
4866
toolchainDetection.set(false)

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
implementation(project(":exporters:otlp:all"))
2222
}
2323

24-
// org.graalvm.buildtools.native pluging requires java 11+ as of version 0.9.26
24+
// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26
2525
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
2626
tasks {
2727
withType<JavaCompile>().configureEach {
@@ -41,6 +41,24 @@ graalvmNative {
4141
// Required as of junit 5.10.0: https://junit.org/junit5/docs/5.10.0/release-notes/#deprecations-and-breaking-changes
4242
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherConfig")
4343
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.config.InstantiatingConfigurationParameterConverter")
44+
// Required as of junit 5.13.0: https://junit.org/junit5/docs/5.13.0/release-notes/#deprecations-and-breaking-changes
45+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.api.DisplayNameGenerator\$IndicativeSentences")
46+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$ClassInfo")
47+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor\$LifecycleMethods")
48+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateInvocationTestDescriptor")
49+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ClassTemplateTestDescriptor")
50+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.DynamicDescendantFilter\$Mode")
51+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.ExclusiveResourceCollector\$1")
52+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.descriptor.MethodBasedTestDescriptor\$MethodInfo")
53+
buildArgs.add("--initialize-at-build-time=org.junit.jupiter.engine.discovery.ClassSelectorResolver\$DummyClassTemplateInvocationContext")
54+
buildArgs.add("--initialize-at-build-time=org.junit.platform.engine.support.store.NamespacedHierarchicalStore\$EvaluatedValue")
55+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.DiscoveryIssueNotifier")
56+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.HierarchicalOutputDirectoryProvider")
57+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherDiscoveryResult\$EngineResultInfo")
58+
buildArgs.add("--initialize-at-build-time=org.junit.platform.launcher.core.LauncherPhase")
59+
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.DiscoverySelectorResolver")
60+
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$DiscoveryIssueForwardingListener")
61+
buildArgs.add("--initialize-at-build-time=org.junit.platform.suite.engine.SuiteTestDescriptor\$LifecycleMethods")
4462
}
4563
}
4664
toolchainDetection.set(false)

‎integration-tests/src/test/java/io/opentelemetry/B3PropagationIntegrationTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import io.opentelemetry.sdk.trace.SdkTracerProvider;
3131
import io.opentelemetry.sdk.trace.data.SpanData;
3232
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
33-
import java.io.IOException;
3433
import java.net.URI;
3534
import java.util.List;
3635
import java.util.function.Supplier;
@@ -44,6 +43,7 @@
4443
import org.junit.jupiter.params.provider.Arguments;
4544
import org.junit.jupiter.params.provider.ArgumentsProvider;
4645
import org.junit.jupiter.params.provider.ArgumentsSource;
46+
import org.junit.jupiter.params.support.ParameterDeclarations;
4747

4848
/** Integration tests for the B3 propagators, in various configurations. */
4949
class B3PropagationIntegrationTest {
@@ -161,7 +161,7 @@ void shutdown() {
161161

162162
@ParameterizedTest
163163
@ArgumentsSource(WebClientArgumentSupplier.class)
164-
void propagation(String testType, WebClient client) throws IOException {
164+
void propagation(String testType, WebClient client) {
165165
OpenTelemetrySdk clientSdk = setupClient();
166166

167167
Span span = clientSdk.getTracer("testTracer").spanBuilder("clientSpan").startSpan();
@@ -182,7 +182,7 @@ void propagation(String testType, WebClient client) throws IOException {
182182

183183
@ParameterizedTest
184184
@ArgumentsSource(WebClientArgumentSupplier.class)
185-
void noClientTracing(String testType, WebClient client) throws IOException {
185+
void noClientTracing(String testType, WebClient client) {
186186
assertThat(client.get("/frontend").aggregate().join().contentUtf8()).isEqualTo("OK");
187187

188188
List<SpanData> finishedSpanItems = spanExporter.getFinishedSpanItems();
@@ -237,7 +237,8 @@ public String get(@Nullable HttpRequest carrier, String key) {
237237

238238
public static class WebClientArgumentSupplier implements ArgumentsProvider {
239239
@Override
240-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
240+
public Stream<? extends Arguments> provideArguments(
241+
ParameterDeclarations parameters, ExtensionContext context) {
241242
return Stream.of(
242243
Arguments.of("b3multi", b3MultiClient), Arguments.of("b3single", b3SingleClient));
243244
}

‎sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import org.junit.jupiter.params.provider.Arguments;
5252
import org.junit.jupiter.params.provider.ArgumentsProvider;
5353
import org.junit.jupiter.params.provider.ArgumentsSource;
54+
import org.junit.jupiter.params.support.ParameterDeclarations;
5455
import org.slf4j.event.Level;
5556
import org.slf4j.event.LoggingEvent;
5657

@@ -192,7 +193,8 @@ void clientTlsConnectionWorks(byte[] privateKey) throws IOException {
192193
private static class ClientPrivateKeyProvider implements ArgumentsProvider {
193194
@Override
194195
@SuppressWarnings("PrimitiveArrayPassedToVarargsMethod")
195-
public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
196+
public Stream<? extends Arguments> provideArguments(
197+
ParameterDeclarations parameters, ExtensionContext context) throws Exception {
196198
return Stream.of(
197199
arguments(named("PEM", Files.readAllBytes(clientCertificate.privateKeyFile().toPath()))),
198200
arguments(named("DER", clientCertificate.privateKey().getEncoded())));

0 commit comments

Comments
 (0)