This is an automated email from the ASF dual-hosted git repository.
roryqi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git
The following commit(s) were added to refs/heads/master by this push:
new d87dc9004 [#1472][part-1] fix(server): Upgrade Netty and GRPC (#1520)
d87dc9004 is described below
commit d87dc900407d4faa9ba5f80cd19d08513e71082d
Author: RickyMa <[email protected]>
AuthorDate: Tue Feb 13 09:59:31 2024 +0800
[#1472][part-1] fix(server): Upgrade Netty and GRPC (#1520)
### What changes were proposed in this pull request?
Upgrade Netty and GRPC
### Why are the changes needed?
A sub PR for: https://github.com/apache/incubator-uniffle/pull/1519
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Existing UTs.
---
client-mr/core/pom.xml | 9 ++++++++-
client-spark/spark2-shaded/pom.xml | 9 ++++++++-
client-spark/spark3-shaded/pom.xml | 9 ++++++++-
client-tez/pom.xml | 9 ++++++++-
pom.xml | 12 ++++++------
5 files changed, 38 insertions(+), 10 deletions(-)
diff --git a/client-mr/core/pom.xml b/client-mr/core/pom.xml
index d860b0b68..3b016a680 100644
--- a/client-mr/core/pom.xml
+++ b/client-mr/core/pom.xml
@@ -141,7 +141,7 @@
<include>io.grpc:*</include>
<include>com.google.android:annotations</include>
<include>io.perfmark:perfmark-api</include>
- <include>io.netty:netty-all</include>
+ <include>io.netty:*</include>
<include>com.google.api.grpc:proto-google-common-protos</include>
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
<include>com.google.guava:*</include>
@@ -261,6 +261,13 @@
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so"
type="glob"></mapper>
</move>
+ <move includeemptydirs="false"
+
todir="${project.build.directory}/unpacked/META-INF/native">
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
+ <mapper
from="libnetty_transport_native_epoll_riscv64.so"
+
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_riscv64.so"
+ type="glob"></mapper>
+ </move>
<move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
<fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
diff --git a/client-spark/spark2-shaded/pom.xml
b/client-spark/spark2-shaded/pom.xml
index 74bea5399..bca2aad1b 100644
--- a/client-spark/spark2-shaded/pom.xml
+++ b/client-spark/spark2-shaded/pom.xml
@@ -59,7 +59,7 @@
<include>io.grpc:*</include>
<include>com.google.android:annotations</include>
<include>io.perfmark:perfmark-api</include>
- <include>io.netty:netty-all</include>
+ <include>io.netty:*</include>
<include>com.google.api.grpc:proto-google-common-protos</include>
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
<include>com.google.guava:*</include>
@@ -178,6 +178,13 @@
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so"
type="glob"></mapper>
</move>
+ <move includeemptydirs="false"
+
todir="${project.build.directory}/unpacked/META-INF/native">
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
+ <mapper from="libnetty_transport_native_epoll_riscv64.so"
+
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_riscv64.so"
+ type="glob"></mapper>
+ </move>
<move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
<fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
diff --git a/client-spark/spark3-shaded/pom.xml
b/client-spark/spark3-shaded/pom.xml
index 615adb15d..35e56f016 100644
--- a/client-spark/spark3-shaded/pom.xml
+++ b/client-spark/spark3-shaded/pom.xml
@@ -59,7 +59,7 @@
<include>io.grpc:*</include>
<include>com.google.android:annotations</include>
<include>io.perfmark:perfmark-api</include>
- <include>io.netty:netty-all</include>
+ <include>io.netty:*</include>
<include>com.google.api.grpc:proto-google-common-protos</include>
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
<include>com.google.guava:*</include>
@@ -178,6 +178,13 @@
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so"
type="glob"></mapper>
</move>
+ <move includeemptydirs="false"
+
todir="${project.build.directory}/unpacked/META-INF/native">
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
+ <mapper from="libnetty_transport_native_epoll_riscv64.so"
+
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_riscv64.so"
+ type="glob"></mapper>
+ </move>
<move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
<fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
diff --git a/client-tez/pom.xml b/client-tez/pom.xml
index a632eea08..fab61259a 100644
--- a/client-tez/pom.xml
+++ b/client-tez/pom.xml
@@ -154,7 +154,7 @@
<include>io.grpc:*</include>
<include>com.google.android:annotations</include>
<include>io.perfmark:perfmark-api</include>
- <include>io.netty:netty-all</include>
+ <include>io.netty:*</include>
<include>com.google.api.grpc:proto-google-common-protos</include>
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
<include>com.google.guava:*</include>
@@ -274,6 +274,13 @@
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_aarch_64.so"
type="glob"></mapper>
</move>
+ <move includeemptydirs="false"
+
todir="${project.build.directory}/unpacked/META-INF/native">
+ <fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
+ <mapper
from="libnetty_transport_native_epoll_riscv64.so"
+
to="lib${rss.shade.native.packageName}_netty_transport_native_epoll_riscv64.so"
+ type="glob"></mapper>
+ </move>
<move includeemptydirs="false"
todir="${project.build.directory}/unpacked/META-INF/native">
<fileset
dir="${project.build.directory}/unpacked/META-INF/native"></fileset>
diff --git a/pom.xml b/pom.xml
index 76b7451af..82022ca4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,12 +60,12 @@
<commons-lang3.version>3.10</commons-lang3.version>
<commons-codec.version>1.9</commons-codec.version>
<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
- <error_prone_annotations.version>2.10.0</error_prone_annotations.version>
+ <error_prone_annotations.version>2.23.0</error_prone_annotations.version>
<execution.root>${user.dir}</execution.root>
<fasterxml.jackson.version>2.10.0</fasterxml.jackson.version>
- <grpc.version>1.47.0</grpc.version>
- <gson.version>2.9.0</gson.version>
- <guava.version>31.0.1-jre</guava.version>
+ <grpc.version>1.61.1</grpc.version>
+ <gson.version>2.10.1</gson.version>
+ <guava.version>32.1.3-jre</guava.version>
<hadoop.scope>provided</hadoop.scope>
<hadoop.version>2.8.5</hadoop.version>
<httpclient.version>4.5.3</httpclient.version>
@@ -84,11 +84,11 @@
<spotless-maven-plugin.version>2.30.0</spotless-maven-plugin.version>
<metrics.version>3.1.0</metrics.version>
<mockito.version>3.12.4</mockito.version>
- <netty.version>4.1.68.Final</netty.version>
+ <netty.version>4.1.106.Final</netty.version>
<picocli.version>4.5.2</picocli.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<prometheus.simpleclient.version>0.9.0</prometheus.simpleclient.version>
- <protobuf.version>3.19.6</protobuf.version>
+ <protobuf.version>3.25.1</protobuf.version>
<roaring.bitmap.version>0.9.15</roaring.bitmap.version>
<rss.shade.packageName>org.apache.uniffle</rss.shade.packageName>
<skipDeploy>false</skipDeploy>
