Skip to content

Commit 244b723

Browse files
authored
Clean up Spark dependency lists (#2217)
Clearing out unused dependencies and restricting scope for compile only dependencies.
1 parent 3d83da4 commit 244b723

File tree

13 files changed

+1
-103
lines changed

13 files changed

+1
-103
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ class BaseBuildPlugin implements Plugin<Project> {
164164
private static void configureRepositories(Project project) {
165165
project.repositories.mavenCentral()
166166
project.repositories.maven { url "https://clojars.org/repo" }
167-
project.repositories.maven { url 'https://repo.spring.io/plugins-release-local' }
168167

169168
// For Elasticsearch snapshots.
170169
project.repositories.maven { url "https://snapshots.elastic.co/maven/" } // default

licenses/protobuf-java-2.5.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

licenses/protobuf-java-LICENSE.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

licenses/protobuf-java-NOTICE.txt

Whitespace-only changes.

spark/core/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ sparkVariants {
5454
add(variant.configuration('compileOnly'), "com.fasterxml.jackson.module:jackson-module-scala_${variant.scalaMajorVersion}:2.9.10")
5555
add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
5656
add(variant.configuration('compileOnly'), "com.google.guava:guava:14.0.1")
57-
add(variant.configuration('compileOnly'), "com.google.protobuf:protobuf-java:2.5.0")
5857
add(variant.configuration('compileOnly'), "org.slf4j:slf4j-api:${project.ext.slf4jVersion}")
5958

6059
add(variant.configuration('test', 'implementation'), project(":test:shared"))

spark/sql-20/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ sparkVariants {
7070
}
7171
add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
7272
add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
73-
add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:2.5.0")
7473
add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
7574
add(variant.configuration('implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
7675
exclude group: 'org.apache.hadoop'
7776
}
7877

7978
// Scala compiler needs these for arcane reasons, but they are not used in the api nor the runtime
79+
add(variant.configuration('compileOnly'), "com.google.protobuf:protobuf-java:3.21.7")
8080
add(variant.configuration('compileOnly'), "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.0.0")
8181
add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
8282
add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:3.2.11")

spark/sql-20/licenses/protobuf-java-2.5.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

spark/sql-20/licenses/protobuf-java-LICENSE.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

spark/sql-20/licenses/protobuf-java-NOTICE.txt

Whitespace-only changes.

spark/sql-30/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ sparkVariants {
7070
}
7171
add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
7272
add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
73-
add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:2.5.0")
7473
add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
7574
add(variant.configuration('implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
7675
exclude group: 'org.apache.hadoop'

spark/sql-30/licenses/protobuf-java-2.5.0.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

spark/sql-30/licenses/protobuf-java-LICENSE.txt

Lines changed: 0 additions & 32 deletions
This file was deleted.

spark/sql-30/licenses/protobuf-java-NOTICE.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)