Clean up Spark dependency lists

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BaseBuildPlugin.groovy

@@ -164,7 +164,6 @@ class BaseBuildPlugin implements Plugin<Project> {
     private static void configureRepositories(Project project) {
         project.repositories.mavenCentral()
         project.repositories.maven { url "https://clojars.org/repo" }
-        project.repositories.maven { url 'https://repo.spring.io/plugins-release-local' }
 
         // For Elasticsearch snapshots.
         project.repositories.maven { url "https://snapshots.elastic.co/maven/" } // default

spark/core/build.gradle

@@ -54,7 +54,6 @@ sparkVariants {
             add(variant.configuration('compileOnly'), "com.fasterxml.jackson.module:jackson-module-scala_${variant.scalaMajorVersion}:2.9.10")
             add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
             add(variant.configuration('compileOnly'), "com.google.guava:guava:14.0.1")
-            add(variant.configuration('compileOnly'), "com.google.protobuf:protobuf-java:2.5.0")
             add(variant.configuration('compileOnly'), "org.slf4j:slf4j-api:${project.ext.slf4jVersion}")
 
             add(variant.configuration('test', 'implementation'), project(":test:shared"))

spark/sql-20/build.gradle

@@ -70,13 +70,13 @@ sparkVariants {
             }
             add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
             add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
-            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:2.5.0")
             add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
             add(variant.configuration('implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'
             }
 
             // Scala compiler needs these for arcane reasons, but they are not used in the api nor the runtime
+            add(variant.configuration('compileOnly'), "com.google.protobuf:protobuf-java:3.21.7")
             add(variant.configuration('compileOnly'), "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.0.0")
             add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
             add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:3.2.11")

spark/sql-30/build.gradle

@@ -70,7 +70,6 @@ sparkVariants {
             }
             add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
             add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
-            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:2.5.0")
             add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
             add(variant.configuration('implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'