cr feedback

airbnb · Jan 2, 2025 · ac96222 · ac96222
1 parent 9bb179c
commit ac96222
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/jvm/maven_repo.bzl b/jvm/maven_repo.bzl
@@ -7,6 +7,7 @@ maven_repo = repo(
     artifacts = [
         "org.scala-lang.modules:scala-collection-compat_2.12:2.6.0",
         "org.scala-lang.modules:scala-collection-compat_2.13:2.6.0",
+        "org.scala-lang.modules:scala-parser-combinators_2.13:2.4.0",
         "org.scala-lang.modules:scala-java8-compat_2.12:1.0.0",
         "org.scala-lang.modules:scala-java8-compat_2.13:1.0.0",
         "org.apache.thrift:libthrift:0.13.0",

diff --git a/jvm/spark_3_1_repo.bzl b/jvm/spark_3_1_repo.bzl
@@ -11,12 +11,10 @@ spark_3_1_repo = repo(name = "spark_3_1", provided = True, artifacts = [
     versioned_artifacts("3.1.3", [
         "org.apache.spark:spark-core_2.12:jar:tests",
         "org.apache.spark:spark-hive_2.12",
-        "org.apache.spark:spark-mllib_2.12",
         "org.apache.spark:spark-sql-kafka-0-10_2.12",
         "org.apache.spark:spark-sql_2.12",
         "org.apache.spark:spark-streaming-kafka-0-10_2.12",
     ]),
-    "org.elasticsearch:elasticsearch-hadoop:6.4.2",
     versioned_artifacts("3.7.0-M5", [
         "org.json4s:json4s-ast_2.12",
         "org.json4s:json4s-core_2.12",

diff --git a/jvm/spark_3_2_repo.bzl b/jvm/spark_3_2_repo.bzl
@@ -11,13 +11,13 @@ spark_3_2_repo = repo(
     artifacts = [
         # Spark artifacts - only Scala 2.12 since that's our target
         "org.apache.spark:spark-sql_2.12:{spark_version}",
-        "org.apache.spark:spark-mllib_2.12:{spark_version}",
         "org.apache.spark:spark-hive_2.12:{spark_version}",
+        "org.apache.spark:spark-streaming_2.12:{spark_version}",
 
         # Spark artifacts for Scala 2.13
         "org.apache.spark:spark-sql_2.13:{spark_version}",
-        "org.apache.spark:spark-mllib_2.13:{spark_version}",
         "org.apache.spark:spark-hive_2.13:{spark_version}",
+        "org.apache.spark:spark-streaming_2.13:{spark_version}",
 
         # Other dependencies
         "org.apache.curator:apache-curator:2.12.0",

diff --git a/jvm/spark_3_5_repo.bzl b/jvm/spark_3_5_repo.bzl
@@ -9,15 +9,15 @@ spark_3_5_repo = repo(
         "hadoop_version": "3.3.6",
     },
     artifacts = [
-        # Spark artifacts - only Scala 2.12 since that's our target
+        # Spark artifacts - for scala 2.12
         "org.apache.spark:spark-sql_2.12:{spark_version}",
-        "org.apache.spark:spark-mllib_2.12:{spark_version}",
         "org.apache.spark:spark-hive_2.12:{spark_version}",
+        "org.apache.spark:spark-streaming_2.12:{spark_version}",
 
         # Spark artifacts for Scala 2.13
         "org.apache.spark:spark-sql_2.13:{spark_version}",
-        "org.apache.spark:spark-mllib_2.13:{spark_version}",
         "org.apache.spark:spark-hive_2.13:{spark_version}",
+        "org.apache.spark:spark-streaming_2.13:{spark_version}",
 
         # Other dependencies
         "org.apache.curator:apache-curator:2.12.0",
@@ -27,8 +27,6 @@ spark_3_5_repo = repo(
         "com.yahoo.datasketches:sketches-hive:0.13.0",
         "org.apache.datasketches:datasketches-java:2.0.0",
         "org.apache.datasketches:datasketches-memory:1.3.0",
-        "org.apache.hadoop:hadoop-aws:3.3.6",
-        "com.amazonaws:aws-java-sdk-s3:1.12.367",
 
         # Kafka dependencies - only Scala 2.12
         "org.apache.kafka:kafka_2.12:2.6.3",