(beam) branch master updated: Pin protobuf for older hadoop tests (#33525)

[damccorm]

This is an automated email from the ASF dual-hosted git repository.

damccorm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new fa086f99e24 Pin protobuf for older hadoop tests (#33525)
fa086f99e24 is described below

commit fa086f99e24d320f69f7901b2e4aa55060f559ec
Author: Danny McCormick <dannymccorm...@google.com>
AuthorDate: Tue Jan 7 15:58:07 2025 -0500

    Pin protobuf for older hadoop tests (#33525)
    
    * Pin protobuf for older hadoop tests
    
    * trigger postcommit
---
 .github/trigger_files/beam_PostCommit_Java_Hadoop_Versions.json | 2 +-
 sdks/java/io/hadoop-file-system/build.gradle                    | 5 +++++
 2 files changed, 6 insertions(+), 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 8784d0786c0..53d94cfc4f1 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
diff --git a/sdks/java/io/hadoop-file-system/build.gradle 
b/sdks/java/io/hadoop-file-system/build.gradle
index b4ebbfa08c5..d78d6a300ca 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"
+      }
     }
   }
 }