Merge pull request #12965 from [BEAM-5748] Upgrade conscrypt to lates…

…t version [BEAM-5748] Upgrade conscrypt to latest version
apache · Sep 30, 2020 · 443cf83 · 443cf83
2 parents 943a948 + 8887f0f
commit 443cf83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle
@@ -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

diff --git a/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle b/runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle
@@ -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 {
@@ -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