From 9afcf8360b49306ff7ce267e1afaecd7e06e26b8 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Wed, 24 Sep 2025 23:43:22 -0700 Subject: [PATCH] [SPARK-53712] Fix `spark-operator` to use `JUnit 5` instead of `JUnit 4` --- spark-operator/build.gradle | 4 +++- .../spark/k8s/operator/metrics/MetricsSystemFactoryTest.java | 2 +- .../metrics/source/KubernetesMetricsInterceptorTest.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spark-operator/build.gradle b/spark-operator/build.gradle index 57f6d428..27f0b260 100644 --- a/spark-operator/build.gradle +++ b/spark-operator/build.gradle @@ -65,7 +65,9 @@ dependencies { exclude group: "org.apache.logging.log4j" exclude group: "org.slf4j" } - testImplementation(libs.mockwebserver) + testImplementation(libs.mockwebserver) { + exclude group: 'junit' + } testImplementation platform(libs.junit.bom) testImplementation(libs.junit.jupiter) testRuntimeOnly(libs.junit.platform.launcher) diff --git a/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/MetricsSystemFactoryTest.java b/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/MetricsSystemFactoryTest.java index a9a341b7..b0efcc9e 100644 --- a/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/MetricsSystemFactoryTest.java +++ b/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/MetricsSystemFactoryTest.java @@ -20,7 +20,7 @@ package org.apache.spark.k8s.operator.metrics; import static org.apache.spark.k8s.operator.metrics.MetricsSystemFactory.parseSinkProperties; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Properties; diff --git a/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptorTest.java b/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptorTest.java index 54d5214d..51efcc2c 100644 --- a/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptorTest.java +++ b/spark-operator/src/test/java/org/apache/spark/k8s/operator/metrics/source/KubernetesMetricsInterceptorTest.java @@ -19,7 +19,7 @@ package org.apache.spark.k8s.operator.metrics.source; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Arrays; import java.util.Collections;