Skip to content

Commit 3ba084a

Browse files
committed
Exclude spark40 configurations from BuildPlugin slf4j 1.7.6 pinning for Spark 4.1 compatibility
Signed-off-by: Sotaro Hikita <bering1814@gmail.com>
1 parent 683c45c commit 3ba084a

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

buildSrc/src/main/groovy/org/opensearch/hadoop/gradle/BuildPlugin.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ class BuildPlugin implements Plugin<Project> {
308308
}
309309

310310
// Deal with the messy conflicts out there
311-
project.configurations.all { Configuration conf ->
311+
// Exclude spark40 configurations from slf4j 1.7.x pinning (Spark 4.1+ requires slf4j 2.x)
312+
project.configurations.matching { !it.name.contains("spark40") && !it.name.contains("Spark40") }.all { Configuration conf ->
312313
conf.resolutionStrategy { ResolutionStrategy resolve ->
313314
// Locking on to joda 2.8
314315
resolve.force('joda-time:joda-time:2.8')

spark/core/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ sparkVariants {
5454
add(variant.configuration('compileOnly'), "org.apache.spark:spark-common-utils-java_${variant.scalaMajorVersion}:${variant.sparkVersion}")
5555
}
5656

57+
5758
add(variant.configuration('implementation'), project(":opensearch-hadoop-mr"))
5859
add(variant.configuration('implementation'), "commons-logging:commons-logging:1.3.5")
5960

0 commit comments

Comments
 (0)