Skip to content

Fix hadoop version tests. #34155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Abacn merged 2 commits into from
Mar 4, 2025
Merged

Fix hadoop version tests. #34155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1db3a5
Fix hadoop version tests.
shunping Mar 4, 2025
b5ea8cd
Trigger post-commit tests.
shunping Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/trigger_files/beam_PostCommit_Java_Hadoop_Versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run",
"modification": 3
"modification": 4
}
3 changes: 2 additions & 1 deletion .github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Spark.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"https://github.com/apache/beam/pull/33267": "noting that PR #33267 should run this test",
"https://github.com/apache/beam/pull/33322": "noting that PR #33322 should run this test",
"https://github.com/apache/beam/pull/34123": "noting that PR #34123 should run this test",
"https://github.com/apache/beam/pull/34080": "noting that PR #34080 should run this test"
"https://github.com/apache/beam/pull/34080": "noting that PR #34080 should run this test",
"https://github.com/apache/beam/pull/34155": "noting that PR #34155 should run this test"
}
3 changes: 2 additions & 1 deletion .github/trigger_files/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"https://github.com/apache/beam/pull/32546": "noting that PR #32546 should run this test",
"https://github.com/apache/beam/pull/33267": "noting that PR #33267 should run this test",
"https://github.com/apache/beam/pull/34123": "noting that PR #34123 should run this test",
"https://github.com/apache/beam/pull/34080": "noting that PR #34080 should run this test"
"https://github.com/apache/beam/pull/34080": "noting that PR #34080 should run this test",
"https://github.com/apache/beam/pull/34155": "noting that PR #34155 should run this test"
}
3 changes: 2 additions & 1 deletion .github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"https://github.com/apache/beam/pull/32546": "noting that PR #32546 should run this test",
"https://github.com/apache/beam/pull/33267": "noting that PR #33267 should run this test",
"https://github.com/apache/beam/pull/33322": "noting that PR #33322 should run this test",
"https://github.com/apache/beam/pull/34080": "noting that PR #34080 should run this test"
"https://github.com/apache/beam/pull/34080": "noting that PR #34080 should run this test",
"https://github.com/apache/beam/pull/34155": "noting that PR #34155 should run this test"
}
2 changes: 2 additions & 0 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,8 @@ class BeamModulePlugin implements Plugin<Project> {
log4j2_core : "org.apache.logging.log4j:log4j-core:$log4j2_version",
log4j2_to_slf4j : "org.apache.logging.log4j:log4j-to-slf4j:$log4j2_version",
log4j2_slf4j_impl : "org.apache.logging.log4j:log4j-slf4j-impl:$log4j2_version",
log4j2_slf4j2_impl : "org.apache.logging.log4j:log4j-slf4j2-impl:$log4j2_version",
log4j2_log4j12_api : "org.apache.logging.log4j:log4j-1.2-api:$log4j2_version",
mockito_core : "org.mockito:mockito-core:4.11.0",
mockito_inline : "org.mockito:mockito-inline:4.11.0",
mongo_java_driver : "org.mongodb:mongo-java-driver:3.12.11",
Expand Down
18 changes: 16 additions & 2 deletions runners/spark/spark_runner.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,17 @@ dependencies {
validatesRunner project(":sdks:java:io:hadoop-format").sourceSets.test.output
validatesRunner project(path: ":examples:java", configuration: "testRuntimeMigration")
validatesRunner project(path: project.path, configuration: "testRuntimeMigration")
validatesRunner library.java.log4j2_api
validatesRunner library.java.log4j2_core
hadoopVersions.each { kv ->
"hadoopVersion$kv.key" "org.apache.hadoop:hadoop-common:$kv.value"
// Force paranamer 2.8 to avoid issues when using Scala 2.12
"hadoopVersion$kv.key" "com.thoughtworks.paranamer:paranamer:2.8"
if ("$spark_version" >= "3.5.0") {
// Add log4j 2.x dependencies as Spark 3.5+ uses slf4j with log4j 2.x backend
"hadoopVersion$kv.key" library.java.log4j2_api
"hadoopVersion$kv.key" library.java.log4j2_core
"hadoopVersion$kv.key" library.java.log4j2_slf4j2_impl
"hadoopVersion$kv.key" library.java.log4j2_log4j12_api
}
}
}

Expand All @@ -240,13 +245,22 @@ configurations.all {
configurations.validatesRunner {
// Exclude to make sure log4j binding is used
exclude group: "org.slf4j", module: "slf4j-simple"

if ("$spark_version" >= "3.5.0") {
// Exclude log4j 1.x dependencies to prevent conflict with log4j 2.x used by spark 3.5+
exclude group: "log4j", module: "log4j"
}
}

hadoopVersions.each { kv ->
configurations."hadoopVersion$kv.key" {
resolutionStrategy {
force "org.apache.hadoop:hadoop-common:$kv.value"
}
if ("$spark_version" >= "3.5.0") {
// Exclude log4j 1.x dependencies to prevent conflict with log4j 2.x used by spark 3.5+
exclude group: "log4j", module: "log4j"
}
}
}

Expand Down
Loading