You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by bo...@apache.org on 2020/09/30 20:44:33 UTC
[beam] branch master updated: Upgrade conscrypt to latest version
This is an automated email from the ASF dual-hosted git repository.
boyuanz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 8887f0f Upgrade conscrypt to latest version
new 443cf83 Merge pull request #12965 from [BEAM-5748] Upgrade conscrypt to latest version
8887f0f is described below
commit 8887f0f5d9eafac7533047243288506eda1ec831
Author: Justin White <ju...@gmail.com>
AuthorDate: Tue Sep 29 13:18:58 2020 -0400
Upgrade conscrypt to latest version
---
runners/google-cloud-dataflow-java/worker/build.gradle | 2 +-
runners/google-cloud-dataflow-java/worker/legacy-worker/build.gradle | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/runners/google-cloud-dataflow-java/worker/build.gradle b/runners/google-cloud-dataflow-java/worker/build.gradle
index 3421c1a..ea74923 100644
--- 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
index 1f9a2e3..e33eba9 100644
--- 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