[beam] branch master updated: [BEAM-9288] Not bundle conscrypt in gRPC vendor in META-INF/

[lcwik]

This is an automated email from the ASF dual-hosted git repository.

lcwik 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 c124011  [BEAM-9288] Not bundle conscrypt in gRPC vendor in META-INF/
     new 28d05d3  Merge pull request #11049 from 
amaliujia/rw-exclude_form_vendoring
c124011 is described below

commit c124011f238c982dcf1d34125df5078da9873d26
Author: amaliujia <amaliu...@163.com>
AuthorDate: Wed Mar 4 15:14:32 2020 -0800

    [BEAM-9288] Not bundle conscrypt in gRPC vendor in META-INF/
---
 .../src/main/groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy  | 2 ++
 1 file changed, 2 insertions(+)

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 efed000..2ab32a7 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
@@ -183,6 +183,8 @@ class GrpcVendoring_1_26_0 {
       "org/checkerframework/**",
       "org/codehaus/mojo/animal_sniffer/**",
       "org/conscrypt/**",
+      "META-INF/native/libconscrypt**",
+      "META-INF/native/conscrypt**",
       "org/hamcrest/**",
       // This Main class prevents shading (BEAM-9252)
       "org/jboss/modules/Main*",