Skip to content

force avro 1.11.4 for the expansion service #34994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liferoad merged 2 commits into from
May 19, 2025
+24 −2
Merged

force avro 1.11.4 for the expansion service #34994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8a3b35
force avro 1.11.4 for the expansion service
liferoad May 18, 2025
07185e2
added resolutionStrategy.force for other expansion services
liferoad May 19, 2025
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
1 change: 1 addition & 0 deletions buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ class BeamModulePlugin implements Plugin<Project> {
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",
// TODO: https://github.com/apache/beam/issues/34993 after stopping supporting Java 8
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",
Expand Down
6 changes: 6 additions & 0 deletions sdks/java/extensions/schemaio-expansion-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ applyJavaNature(
}
)

configurations.runtimeClasspath {
// Pin avro to 1.11.4 due to https://github.com/apache/beam/issues/34968
// cannot upgrade this to the latest version due to https://github.com/apache/beam/issues/34993
resolutionStrategy.force 'org.apache.avro:avro:1.11.4'
}

dependencies {
implementation project(path: ":sdks:java:expansion-service")
permitUnusedDeclared project(path: ":sdks:java:expansion-service") // BEAM-11761
Expand Down
8 changes: 7 additions & 1 deletion sdks/java/extensions/sql/expansion-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ applyJavaNature(
}
)

configurations.runtimeClasspath {
// Pin avro to 1.11.4 due to https://github.com/apache/beam/issues/34968
// cannot upgrade this to the latest version due to https://github.com/apache/beam/issues/34993
resolutionStrategy.force 'org.apache.avro:avro:1.11.4'
}

description = "Apache Beam :: SDKs :: Java :: SQL :: Expansion Service"
ext.summary = """Contains code to run a SQL Expansion Service."""

Expand All @@ -52,4 +58,4 @@ shadowJar {
attributes(["Multi-Release": true])
}
outputs.upToDateWhen { false }
}
}
3 changes: 3 additions & 0 deletions sdks/java/io/expansion-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ applyJavaNature(
configurations.runtimeClasspath {
// Pin kafka-clients version due to <3.4.0 missing auth callback classes.
resolutionStrategy.force 'org.apache.kafka:kafka-clients:3.9.0'
// Pin avro to 1.11.4 due to https://github.com/apache/beam/issues/34968
// cannot upgrade this to the latest version due to https://github.com/apache/beam/issues/34993
resolutionStrategy.force 'org.apache.avro:avro:1.11.4'
}

shadowJar {
Expand Down
8 changes: 7 additions & 1 deletion sdks/java/io/google-cloud-platform/expansion-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ applyJavaNature(
shadowClosure: {},
)

configurations.runtimeClasspath {
// Pin avro to 1.11.4 due to https://github.com/apache/beam/issues/34968
// cannot upgrade this to the latest version due to https://github.com/apache/beam/issues/34993
resolutionStrategy.force 'org.apache.avro:avro:1.11.4'
}

description = "Apache Beam :: SDKs :: Java :: IO :: Google Cloud Platform :: Expansion Service"
ext.summary = "Expansion service serving GCP Java IOs"

Expand Down Expand Up @@ -53,4 +59,4 @@ shadowJar {
attributes(["Multi-Release": true])
}
outputs.upToDateWhen { false }
}
}
Loading