You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ratis.apache.org by sz...@apache.org on 2022/02/15 08:27:10 UTC
[ratis-thirdparty] branch master updated: RATIS-1515. Upgrade gRPC to 1.44.0, Netty to 4.1.74 (#28)
This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new a785b4e RATIS-1515. Upgrade gRPC to 1.44.0, Netty to 4.1.74 (#28)
a785b4e is described below
commit a785b4e68d79907d34b164fe6f94893ee6cc6123
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Feb 15 09:27:07 2022 +0100
RATIS-1515. Upgrade gRPC to 1.44.0, Netty to 4.1.74 (#28)
---
misc/pom.xml | 5 +++++
pom.xml | 11 ++---------
.../java/org/apache/ratis/thirdparty/demo/GrpcSslTest.java | 7 ++++++-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/misc/pom.xml b/misc/pom.xml
index b865d46..51823fa 100644
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -173,6 +173,7 @@
<exclude>META-INF/native/libnetty_tcnative_linux_aarch_64.so</exclude>
<exclude>META-INF/native/libnetty_tcnative_linux_x86_64.so</exclude>
<exclude>META-INF/native/netty_tcnative_windows_x86_64.dll</exclude>
+ <exclude>META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib</exclude>
<exclude>META-INF/native/libnetty_tcnative_osx_x86_64.jnilib</exclude>
</excludes>
</filter>
@@ -285,6 +286,10 @@
<destinationFile>${project.build.directory}/classes/META-INF/native/${ratis.thirdparty.shaded.native.prefix}netty_tcnative_windows_x86_64.dll</destinationFile>
</fileSet>
<fileSet>
+ <sourceFile>${project.build.directory}/classes/META-INF/native/libnetty_tcnative_osx_aarch_64.jnilib</sourceFile>
+ <destinationFile>${project.build.directory}/classes/META-INF/native/lib${ratis.thirdparty.shaded.native.prefix}netty_tcnative_osx_aarch_64.jnilib</destinationFile>
+ </fileSet>
+ <fileSet>
<sourceFile>${project.build.directory}/classes/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib</sourceFile>
<destinationFile>${project.build.directory}/classes/META-INF/native/lib${ratis.thirdparty.shaded.native.prefix}netty_tcnative_osx_x86_64.jnilib</destinationFile>
</fileSet>
diff --git a/pom.xml b/pom.xml
index ad0e290..ac4884d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,11 +70,9 @@
<!--Version of protobuf to be shaded -->
<shaded.protobuf.version>3.19.2</shaded.protobuf.version>
<!--Version of grpc to be shaded -->
- <shaded.grpc.version>1.43.2</shaded.grpc.version>
+ <shaded.grpc.version>1.44.0</shaded.grpc.version>
<!--Version of Netty to be shaded -->
- <shaded.netty.version>4.1.63.Final</shaded.netty.version>
- <!--Version of tcnative to be shaded -->
- <shaded.netty.tcnative.version>2.0.38.Final</shaded.netty.tcnative.version>
+ <shaded.netty.version>4.1.74.Final</shaded.netty.version>
<!-- third party library versions -->
<commons-lang3.version>3.8.1</commons-lang3.version>
@@ -139,11 +137,6 @@
<scope>import</scope>
</dependency>
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-tcnative-boringssl-static</artifactId>
- <version>${shaded.netty.tcnative.version}</version>
- </dependency>
- <dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
<version>${io.opencensus.version}</version>
diff --git a/test/src/test/java/org/apache/ratis/thirdparty/demo/GrpcSslTest.java b/test/src/test/java/org/apache/ratis/thirdparty/demo/GrpcSslTest.java
index 56dca10..1baeb6b 100644
--- a/test/src/test/java/org/apache/ratis/thirdparty/demo/GrpcSslTest.java
+++ b/test/src/test/java/org/apache/ratis/thirdparty/demo/GrpcSslTest.java
@@ -48,7 +48,12 @@ public class GrpcSslTest {
true,
false);
GrpcSslServer server = new GrpcSslServer(port, sslServerConf);
- server.start();
+ try {
+ server.start();
+ } catch (Throwable t) {
+ LOG.error("error starting server", t);
+ throw t;
+ }
Thread serverThread = new Thread(() -> {
try {