From 55abb3f2f104f3ba74c06564bac880c1c172ac34 Mon Sep 17 00:00:00 2001 From: liferoad Date: Fri, 16 May 2025 08:20:32 -0400 Subject: [PATCH 1/2] use avro 1.12.0 --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 4 ++-- it/google-cloud-platform/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 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 a09ce2b3ec15..c4291e7dc9b6 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -681,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:1.11.4", - avro_tests : "org.apache.avro:avro:1.11.3:tests", + avro : "org.apache.avro:avro:1.12.0", + avro_tests : "org.apache.avro:avro:1.12.0: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 f5fbcd8ba5d5..dd72d4ca5f56 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 'org.apache.avro:avro:1.11.1' + implementation 'org.apache.avro:avro:1.12.0' 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' From 1c7e6b4db99684b9b4974b4ed81e12f0c1eaf72b Mon Sep 17 00:00:00 2001 From: liferoad Date: Fri, 16 May 2025 14:51:17 -0400 Subject: [PATCH 2/2] addressed comments --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 5 +++-- it/google-cloud-platform/build.gradle | 2 +- 2 files changed, 4 insertions(+), 3 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 c4291e7dc9b6..8dd66f8e95d4 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -601,6 +601,7 @@ 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" @@ -681,8 +682,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:1.12.0", - avro_tests : "org.apache.avro:avro:1.12.0:tests", + avro : "org.apache.avro:avro:${avro_version}", + avro_tests : "org.apache.avro:avro:${avro_version}: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 dd72d4ca5f56..b5e5f6cc5190 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 'org.apache.avro:avro:1.12.0' + implementation library.java.avro 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'