Skip to content

Commit 683c45c

Browse files
committed
Add spark-common-utils-java dependency
Signed-off-by: Sotaro Hikita <bering1814@gmail.com>
1 parent 08adce2 commit 683c45c

4 files changed

Lines changed: 6 additions & 1 deletion

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
baa11a9dd365536db712361555f4d4d4956d93e8

spark/core/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ sparkVariants {
4747
exclude group: 'org.apache.hadoop'
4848
}
4949

50-
// Spark 4.0 moved org.apache.spark.internal.Logging to spark-common-utils
50+
// Spark 4.x moved org.apache.spark.internal.Logging to spark-common-utils
51+
// Spark 4.1+ further split LogKey into spark-common-utils-java
5152
if (variant.sparkVersion.startsWith("4.")) {
5253
add(variant.configuration('compileOnly'), "org.apache.spark:spark-common-utils_${variant.scalaMajorVersion}:${variant.sparkVersion}")
54+
add(variant.configuration('compileOnly'), "org.apache.spark:spark-common-utils-java_${variant.scalaMajorVersion}:${variant.sparkVersion}")
5355
}
5456

5557
add(variant.configuration('implementation'), project(":opensearch-hadoop-mr"))

spark/sql-40/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ sparkVariants {
5959
// Spark 4.0 split these into separate modules
6060
add(variant.configuration('implementation'), "org.apache.spark:spark-sql-api_${variant.scalaMajorVersion}:$variant.sparkVersion")
6161
add(variant.configuration('implementation'), "org.apache.spark:spark-common-utils_${variant.scalaMajorVersion}:$variant.sparkVersion")
62+
add(variant.configuration('implementation'), "org.apache.spark:spark-common-utils-java_${variant.scalaMajorVersion}:$variant.sparkVersion")
6263

6364
add(variant.configuration('implementation'), "org.apache.spark:spark-sql_${variant.scalaMajorVersion}:$variant.sparkVersion") {
6465
exclude group: 'org.apache.hadoop'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
baa11a9dd365536db712361555f4d4d4956d93e8

0 commit comments

Comments
 (0)