Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sdks/java/expansion-service/container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
4 changes: 4 additions & 0 deletions sdks/java/expansion-service/container/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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'
Expand Down
Loading