From c2a163b5ade777dbaf9430a696e8b45faf2767ca Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 7 Jan 2025 20:19:54 +0000 Subject: [PATCH 1/2] Pin protobuf for older hadoop tests --- sdks/java/io/hadoop-file-system/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle index b4ebbfa08c5e..d78d6a300cac 100644 --- a/sdks/java/io/hadoop-file-system/build.gradle +++ b/sdks/java/io/hadoop-file-system/build.gradle @@ -72,6 +72,11 @@ hadoopVersions.each {kv -> force "org.apache.hadoop:hadoop-hdfs:$kv.value:tests" force "org.apache.hadoop:hadoop-hdfs-client:$kv.value:tests" force library.java.slf4j_jdk14 + if ("$kv.value" == "2.10.2" || "$kv.value" == "3.2.4") { + // Older Hadoop only works with older protobuf + force "com.google.protobuf:protobuf-java:3.25.5" + force "com.google.protobuf:protobuf-java-util:3.25.5" + } } } } From b74cfcc52b8c55a0131b0e20236fe4c766f3144a Mon Sep 17 00:00:00 2001 From: Danny McCormick Date: Tue, 7 Jan 2025 20:21:08 +0000 Subject: [PATCH 2/2] trigger postcommit --- .github/trigger_files/beam_PostCommit_Java_Hadoop_Versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/trigger_files/beam_PostCommit_Java_Hadoop_Versions.json b/.github/trigger_files/beam_PostCommit_Java_Hadoop_Versions.json index 8784d0786c02..53d94cfc4f1e 100644 --- a/.github/trigger_files/beam_PostCommit_Java_Hadoop_Versions.json +++ b/.github/trigger_files/beam_PostCommit_Java_Hadoop_Versions.json @@ -1,4 +1,4 @@ { "comment": "Modify this file in a trivial way to cause this test suite to run", - "modification": 2 + "modification": 3 } \ No newline at end of file