From d8a22cec6210fc761ff3d64e5c3618ae7f411808 Mon Sep 17 00:00:00 2001 From: liferoad Date: Sat, 17 May 2025 18:15:21 -0400 Subject: [PATCH] Revert "use avro 1.12.0 (#34970)" This reverts commit cbe100a53a34abdea80ac2335d36d2297d0f578c. --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 5 ++--- it/google-cloud-platform/build.gradle | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 8dd66f8e95d4..a09ce2b3ec15 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -601,7 +601,6 @@ class BeamModulePlugin implements Plugin { // There are a few versions are determined by the BOMs by running scripts/tools/bomupgrader.py // marked as [bomupgrader]. See the documentation of that script for detail. def activemq_version = "5.14.5" - def avro_version = "1.12.0" def autovalue_version = "1.9" def autoservice_version = "1.0.1" def aws_java_sdk2_version = "2.20.162" @@ -682,8 +681,8 @@ class BeamModulePlugin implements Plugin { antlr_runtime : "org.antlr:antlr4-runtime:4.7", args4j : "args4j:args4j:2.33", auto_value_annotations : "com.google.auto.value:auto-value-annotations:$autovalue_version", - avro : "org.apache.avro:avro:${avro_version}", - avro_tests : "org.apache.avro:avro:${avro_version}:tests", + avro : "org.apache.avro:avro:1.11.4", + avro_tests : "org.apache.avro:avro:1.11.3:tests", aws_java_sdk2_apache_client : "software.amazon.awssdk:apache-client:$aws_java_sdk2_version", aws_java_sdk2_netty_client : "software.amazon.awssdk:netty-nio-client:$aws_java_sdk2_version", aws_java_sdk2_auth : "software.amazon.awssdk:auth:$aws_java_sdk2_version", diff --git a/it/google-cloud-platform/build.gradle b/it/google-cloud-platform/build.gradle index b5e5f6cc5190..f5fbcd8ba5d5 100644 --- a/it/google-cloud-platform/build.gradle +++ b/it/google-cloud-platform/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation library.java.jackson_core implementation library.java.jackson_databind implementation 'org.apache.hadoop:hadoop-common:3.3.5' - implementation library.java.avro + implementation 'org.apache.avro:avro:1.11.1' implementation 'org.apache.parquet:parquet-avro:1.12.0' implementation 'org.apache.parquet:parquet-common:1.12.0' implementation 'org.apache.parquet:parquet-hadoop:1.12.0'