(beam) branch master updated: Pin Avro 1.12 in expansion service container (#36108)

[yhu]

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

yhu 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 4f0bcf63a37 Pin Avro 1.12 in expansion service container (#36108)
4f0bcf63a37 is described below

commit 4f0bcf63a379de9931a7cd9761bc8087b2c361d5
Author: Yi Hu <ya...@google.com>
AuthorDate: Wed Sep 10 15:19:22 2025 -0400

    Pin Avro 1.12 in expansion service container (#36108)
---
 sdks/java/expansion-service/container/Dockerfile   | 2 ++
 sdks/java/expansion-service/container/build.gradle | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/sdks/java/expansion-service/container/Dockerfile 
b/sdks/java/expansion-service/container/Dockerfile
index 1b83ec68b99..2688a317671 100644
--- a/sdks/java/expansion-service/container/Dockerfile
+++ b/sdks/java/expansion-service/container/Dockerfile
@@ -24,6 +24,8 @@ ARG TARGETARCH
 WORKDIR /opt/apache/beam
 
 # Copy dependencies generated by the Gradle build.
+# TODO(https://github.com/apache/beam/issues/34098) remove when Beam moved to 
avro 1.12
+COPY target/avro.jar jars/
 COPY target/beam-sdks-java-io-expansion-service.jar jars/
 COPY target/beam-sdks-java-io-google-cloud-platform-expansion-service.jar jars/
 COPY target/beam-sdks-java-extensions-schemaio-expansion-service.jar jars/
diff --git a/sdks/java/expansion-service/container/build.gradle 
b/sdks/java/expansion-service/container/build.gradle
index cf81d462f08..080eb68c3a2 100644
--- a/sdks/java/expansion-service/container/build.gradle
+++ b/sdks/java/expansion-service/container/build.gradle
@@ -36,6 +36,8 @@ configurations {
 }
 
 dependencies {
+    // TODO(https://github.com/apache/beam/issues/34098) remove when Beam 
moved to avro 1.12
+    dockerDependency "org.apache.avro:avro:1.12.0"
     dockerDependency project(path: 
":sdks:java:extensions:schemaio-expansion-service", configuration: "shadow")
     dockerDependency project(path: ":sdks:java:io:expansion-service", 
configuration: "shadow")
     dockerDependency project(path: 
":sdks:java:io:google-cloud-platform:expansion-service", configuration: 
"shadow")
@@ -48,6 +50,8 @@ goBuild {
 
 task copyDockerfileDependencies(type: Copy) {
     from configurations.dockerDependency
+    // TODO(https://github.com/apache/beam/issues/34098) remove when Beam 
moved to avro 1.12
+    rename 'avro-.*.jar', 'avro.jar'
     rename 'beam-sdks-java-extensions-schemaio-expansion-service-.*.jar', 
'beam-sdks-java-extensions-schemaio-expansion-service.jar'
     rename 'beam-sdks-java-io-expansion-service-.*.jar', 
'beam-sdks-java-io-expansion-service.jar'
     rename 'beam-sdks-java-io-google-cloud-platform-expansion-service-.*.jar', 
'beam-sdks-java-io-google-cloud-platform-expansion-service.jar'