Skip to content

[#25070] Remove Kafka jars from Beam Java SDK Container #25072

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
lukecwik merged 1 commit into from
Jan 19, 2023
Merged

[#25070] Remove Kafka jars from Beam Java SDK Container #25072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions sdks/java/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ ADD target/log4j-over-slf4j.jar /opt/apache/beam/jars/
ADD target/log4j-to-slf4j.jar /opt/apache/beam/jars/
ADD target/beam-sdks-java-harness.jar /opt/apache/beam/jars/

# Required to run cross-language pipelines with KafkaIO
# TODO May be removed once custom environments are supported
ADD target/beam-sdks-java-io-kafka.jar /opt/apache/beam/jars/
ADD target/kafka-clients.jar /opt/apache/beam/jars/

# Required to use jamm as a javaagent to get accurate object size measuring
# COPY fails if file is not found, so use a wildcard for open-module-agent.jar
# since it is only included in Java 9+ containers
Expand Down
2 changes: 0 additions & 2 deletions sdks/java/container/boot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ func main() {
filepath.Join(jarsDir, "log4j-over-slf4j.jar"),
filepath.Join(jarsDir, "log4j-to-slf4j.jar"),
filepath.Join(jarsDir, "beam-sdks-java-harness.jar"),
filepath.Join(jarsDir, "beam-sdks-java-io-kafka.jar"),
filepath.Join(jarsDir, "kafka-clients.jar"),
}

var hasWorkerExperiment = strings.Contains(options, "use_staged_dataflow_worker_jar")
Expand Down
9 changes: 1 addition & 8 deletions sdks/java/container/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ applyGoNature()
applyPythonNature()

evaluationDependsOn(":sdks:java:harness")
evaluationDependsOn(":sdks:java:io:kafka")
evaluationDependsOn(":sdks:java:io:jdbc")

description = "Apache Beam :: SDKs :: Java :: Container"
Expand All @@ -42,10 +41,6 @@ dependencies {
dockerDependency library.java.log4j_over_slf4j
dockerDependency library.java.log4j2_to_slf4j
dockerDependency project(path: ":sdks:java:harness", configuration: "shadow")
// For executing KafkaIO, e.g. as an external transform
dockerDependency project(":sdks:java:io:kafka")
// This dependency is set to 'provided' scope in :sdks:java:io:kafka
dockerDependency library.java.kafka_clients
dockerDependency library.java.jamm
}

Expand All @@ -58,9 +53,7 @@ goBuild {
import com.github.jk1.license.render.*
licenseReport {
projects = [project,
project.rootProject.findProject(':sdks:java:harness'),
project.rootProject.findProject(':sdks:java:io:kafka'),
project.rootProject.findProject(':sdks:java:io:jdbc')]
project.rootProject.findProject(':sdks:java:harness')]
excludeOwnGroup = true
excludeGroups = ["beam.*"] // project dependencies do not match their maven coords
configurations = ALL
Expand Down
2 changes: 0 additions & 2 deletions sdks/java/container/common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ task copyDockerfileDependencies(type: Copy) {
rename 'beam-sdks-java-container-agent.*.jar', 'open-module-agent.jar'
}
rename 'beam-sdks-java-harness-.*.jar', 'beam-sdks-java-harness.jar'
rename 'beam-sdks-java-io-kafka.*.jar', 'beam-sdks-java-io-kafka.jar'
rename 'kafka-clients.*.jar', 'kafka-clients.jar'
rename 'jamm.*.jar', 'jamm.jar'

setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
Expand Down