You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ji...@apache.org on 2020/02/28 08:26:34 UTC
[beam] branch BEAM-9288-PR created (now f9dc1e6)
This is an automated email from the ASF dual-hosted git repository.
jincheng pushed a change to branch BEAM-9288-PR
in repository https://gitbox.apache.org/repos/asf/beam.git.
at f9dc1e6 [BEAM-9288] Not bundle conscrypt in gRPC vendor
This branch includes the following new commits:
new f9dc1e6 [BEAM-9288] Not bundle conscrypt in gRPC vendor
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[beam] 01/01: [BEAM-9288] Not bundle conscrypt in gRPC vendor
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jincheng pushed a commit to branch BEAM-9288-PR
in repository https://gitbox.apache.org/repos/asf/beam.git
commit f9dc1e64428c679067079eb7a1b8424d917bb536
Author: sunjincheng121 <su...@gmail.com>
AuthorDate: Fri Feb 28 16:26:03 2020 +0800
[BEAM-9288] Not bundle conscrypt in gRPC vendor
---
.../groovy/org/apache/beam/gradle/GrpcVendoring_1_26_0.groovy | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
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 16a3f2b..efed000 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
@@ -18,8 +18,6 @@
package org.apache.beam.gradle
-import org.gradle.api.Project
-
/**
* Utilities for working with our vendored version of gRPC.
*/
@@ -75,7 +73,6 @@ class GrpcVendoring_1_26_0 {
"net.jpountz.lz4:lz4:$lz4_version",
"org.bouncycastle:bcpkix-jdk15on:$bouncycastle_version",
"org.bouncycastle:bcprov-jdk15on:$bouncycastle_version",
- "org.conscrypt:conscrypt-openjdk-uber:$conscrypt_version",
"org.eclipse.jetty.alpn:alpn-api:$alpn_api_version",
"org.eclipse.jetty.npn:npn-api:$npn_api_version",
"org.jboss.marshalling:jboss-marshalling:$jboss_marshalling_version",
@@ -92,7 +89,9 @@ class GrpcVendoring_1_26_0 {
'com.google.errorprone:error_prone_annotations:2.3.3',
'commons-logging:commons-logging:1.2',
'org.apache.logging.log4j:log4j-api:2.6.2',
- 'org.slf4j:slf4j-api:1.7.21'
+ 'org.slf4j:slf4j-api:1.7.21',
+ // TODO(BEAM-9288): Enable relocation for conscrypt
+ "org.conscrypt:conscrypt-openjdk-uber:$conscrypt_version"
]
}
@@ -147,7 +146,6 @@ class GrpcVendoring_1_26_0 {
"net.jpountz",
"org.bouncycastle",
"org.cservenak.streams",
- "org.conscrypt",
"org.eclipse.jetty.alpn",
"org.eclipse.jetty.npn",
"org.jboss.marshalling",
@@ -184,6 +182,7 @@ class GrpcVendoring_1_26_0 {
"org/apache/logging/log4j/**",
"org/checkerframework/**",
"org/codehaus/mojo/animal_sniffer/**",
+ "org/conscrypt/**",
"org/hamcrest/**",
// This Main class prevents shading (BEAM-9252)
"org/jboss/modules/Main*",