From 932f87e73329d7d914b23d05bd15d06a6e58132d Mon Sep 17 00:00:00 2001
From: Moritz Mack <mmack@talend.com>
Date: Mon, 24 Oct 2022 11:50:12 +0200
Subject: [PATCH] Bump dropwizard metrics-core for Spark 3 runner to match the
 version used in Spark 3.1 (addresses #23728)

---
 runners/spark/spark_runner.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/runners/spark/spark_runner.gradle b/runners/spark/spark_runner.gradle
index 1869f9c217429..f8c0a061b0d71 100644
--- a/runners/spark/spark_runner.gradle
+++ b/runners/spark/spark_runner.gradle
@@ -152,15 +152,16 @@ dependencies {
   implementation project(":sdks:java:fn-execution")
   implementation library.java.vendored_grpc_1_48_1
   implementation library.java.vendored_guava_26_0_jre
-  implementation "io.dropwizard.metrics:metrics-core:3.1.5" // version used by Spark 2.4
   spark.components.each { component ->
     provided "$component:$spark_version"
   }
   permitUnusedDeclared "org.apache.spark:spark-network-common_$spark_scala_version:$spark_version"
   if (project.property("spark_scala_version").equals("2.11")) {
+    implementation "io.dropwizard.metrics:metrics-core:3.1.5" // version used by Spark 2.4
     compileOnly "org.scala-lang:scala-library:2.11.12"
     runtimeOnly library.java.jackson_module_scala_2_11
   } else {
+    implementation "io.dropwizard.metrics:metrics-core:4.1.1" // version used by Spark 3.1
     compileOnly "org.scala-lang:scala-library:2.12.15"
     runtimeOnly library.java.jackson_module_scala_2_12
   }