From e9ba65a42ee5b4c6730d43e5423dc23c23f73259 Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Mon, 3 Dec 2018 13:19:17 -0800 Subject: [PATCH] all: sync tcnative version The helloworld TLS example can not run properly with the outdated examples/build.gradle. --- SECURITY.md | 8 ++++---- build.gradle | 4 ++++ examples/build.gradle | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 891e00ca9a..4be72cac45 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -90,7 +90,7 @@ In Maven, you can use the [os-maven-plugin](https://github.com/trustin/os-maven- io.netty netty-tcnative-boringssl-static - 2.0.7.Final + 2.0.17.Final @@ -108,7 +108,7 @@ buildscript { } dependencies { - compile 'io.netty:netty-tcnative-boringssl-static:2.0.7.Final' + compile 'io.netty:netty-tcnative-boringssl-static:2.0.17.Final' } ``` @@ -143,7 +143,7 @@ In Maven, you can use the [os-maven-plugin](https://github.com/trustin/os-maven- io.netty netty-tcnative - 2.0.7.Final + 2.0.17.Final ${tcnative.classifier} @@ -211,7 +211,7 @@ if (osdetector.os == "linux" && osdetector.release.isLike("fedora")) { } dependencies { - compile 'io.netty:netty-tcnative:2.0.7.Final:' + tcnative_classifier + compile 'io.netty:netty-tcnative:2.0.17.Final:' + tcnative_classifier } ``` diff --git a/build.gradle b/build.gradle index 963e0fc011..afc95d216d 100644 --- a/build.gradle +++ b/build.gradle @@ -219,6 +219,10 @@ subprojects { netty: "io.netty:netty-codec-http2:[${nettyVersion}]", netty_epoll: "io.netty:netty-transport-native-epoll:${nettyVersion}" + epoll_suffix, netty_proxy_handler: "io.netty:netty-handler-proxy:${nettyVersion}", + + // Keep the following references of tcnative version in sync whenever it's updated + // SECURITY.md (multiple occurrences) + // examples/build.gradle netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.17.Final', conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:1.0.1', diff --git a/examples/build.gradle b/examples/build.gradle index d32a228433..71716901d3 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -23,7 +23,7 @@ targetCompatibility = 1.7 // Feel free to delete the comment at the next line. It is just for safely // updating the version in our release process. def grpcVersion = '1.18.0-SNAPSHOT' // CURRENT_GRPC_VERSION -def nettyTcNativeVersion = '2.0.7.Final' +def nettyTcNativeVersion = '2.0.17.Final' def protobufVersion = '3.5.1' def protocVersion = '3.5.1-1'