From 3caef28b09330cac8393ee79e444486e0852a0a8 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Wed, 10 Sep 2025 11:43:33 -0400 Subject: [PATCH] Pin Avro 1.12 in expansion service container --- 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 1b83ec68b994..2688a3176713 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 cf81d462f08b..080eb68c3a2e 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'