Skip to content
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

Jump to bottom

[BEAM-5748] Upgrade conscrypt to latest version #12965

Merged
merged 1 commit into from
Sep 30, 2020
Merged

[BEAM-5748] Upgrade conscrypt to latest version #12965

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion runners/google-cloud-dataflow-java/worker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ dependencies {
shadow library.java.vendored_guava_26_0_jre
compile library.java.slf4j_api
compile "javax.servlet:javax.servlet-api:3.1.0"
compile "org.conscrypt:conscrypt-openjdk:1.1.3:linux-x86_64"
compile "org.conscrypt:conscrypt-openjdk:2.5.1:linux-x86_64"
compile "org.eclipse.jetty:jetty-server:9.2.10.v20150310"
compile "org.eclipse.jetty:jetty-servlet:9.2.10.v20150310"
compile library.java.error_prone_annotations
Expand Down
4 changes: 2 additions & 2 deletions runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ applyJavaNature(

// TODO(BEAM-6136): Enable relocation for conscrypt
dependencies {
include(dependency("org.conscrypt:conscrypt-openjdk:1.1.3:linux-x86_64"))
include(dependency("org.conscrypt:conscrypt-openjdk:2.5.1:linux-x86_64"))
}

dependencies {
Expand Down Expand Up @@ -211,7 +211,7 @@ dependencies {
compile project(":sdks:java:fn-execution")
compile project(path: ":runners:google-cloud-dataflow-java:worker:windmill", configuration: "shadow")
shadow library.java.vendored_guava_26_0_jre
compile "org.conscrypt:conscrypt-openjdk:1.1.3:linux-x86_64"
compile "org.conscrypt:conscrypt-openjdk:2.5.1:linux-x86_64"
compile "org.eclipse.jetty:jetty-server:9.2.10.v20150310"
compile "org.eclipse.jetty:jetty-servlet:9.2.10.v20150310"
provided library.java.error_prone_annotations
Expand Down