[beam] branch master updated: Upgrade Conscrypt to 2.5.1 in GrpcVendoring_1_26_0

[boyuanz]

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 a95dbc8  Upgrade Conscrypt to 2.5.1 in GrpcVendoring_1_26_0
     new ed09e96  Merge pull request #13150 from [BEAM-5748] Upgrade Conscrypt 
to 2.5.1 in GrpcVendoring_1_26_0
a95dbc8 is described below

commit a95dbc8ad88dc0bb6624039e06c11eb1ab5b961a
Author: Esun Kim <vebl...@google.com>
AuthorDate: Wed Nov 11 10:42:28 2020 -0800

    Upgrade Conscrypt to 2.5.1 in GrpcVendoring_1_26_0
---
 .../src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy 
b/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy
index e0ce931..898faa2 100644
--- 
a/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy
+++ 
b/buildSrc/src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy
@@ -38,7 +38,7 @@ class GrpcVendoring_1_26_0 {
   static def compress_lzf_version = "1.0.3"
   static def lz4_version = "1.3.0"
   static def bouncycastle_version = "1.54"
-  static def conscrypt_version = "1.3.0"
+  static def conscrypt_version = "2.5.1"
   static def alpn_api_version = "1.1.2.v20150522"
   static def npn_api_version = "1.1.1.v20141010"
   static def jboss_marshalling_version = "1.4.11.Final"