Build - Move global Spark 2.4 dependency in version.props to Spark 2.…

…4 subproject (apache#5759)
yabola · Sep 15, 2022 · e1f934c · e1f934c
1 parent 647ae1e
commit e1f934c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/spark/v2.4/build.gradle b/spark/v2.4/build.gradle
@@ -27,6 +27,10 @@ def sparkProjects = [
 ]
 
 configure(sparkProjects) {
+  project.ext {
+    sparkVersion = '2.4.8'
+  }
+
   configurations {
     all {
       resolutionStrategy {
@@ -64,7 +68,7 @@ project(':iceberg-spark:iceberg-spark-2.4') {
 
     compileOnly "com.google.errorprone:error_prone_annotations"
     compileOnly "org.apache.avro:avro"
-    compileOnly("org.apache.spark:spark-hive_2.11") {
+    compileOnly("org.apache.spark:spark-hive_2.11:${sparkVersion}") {
       exclude group: 'org.apache.avro', module: 'avro'
       exclude group: 'org.roaringbitmap'
     }

diff --git a/versions.props b/versions.props
@@ -6,8 +6,6 @@ org.apache.hive:* = 2.3.8
 org.apache.httpcomponents.client5:* = 5.1
 org.apache.orc:* = 1.8.0
 org.apache.parquet:* = 1.12.3
-org.apache.spark:spark-hive_2.11 = 2.4.8
-org.apache.spark:spark-avro_2.11 = 2.4.8
 org.apache.pig:pig = 0.14.0
 com.fasterxml.jackson.*:* = 2.11.4
 com.google.errorprone:error_prone_annotations = 2.3.3