This is an automated email from the ASF dual-hosted git repository.
fcsaky pushed a commit to branch release-1.19
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.19 by this push:
new de44f609ee6 [FLINK-36510][rpc] Bump Pekko to 1.1.2, remove Netty 3
de44f609ee6 is described below
commit de44f609ee687d87d55b269b4858ab9d7287b80b
Author: Grace Grimwood <15976368+gracegrimw...@users.noreply.github.com>
AuthorDate: Tue Nov 5 01:49:15 2024 +1300
[FLINK-36510][rpc] Bump Pekko to 1.1.2, remove Netty 3
Signed-off-by: Grace Grimwood <ggrim...@redhat.com>
---
flink-rpc/flink-rpc-akka/pom.xml | 14 ++++++++++----
.../runtime/rpc/pekko/ActorSystemBootstrapTools.java | 4 +++-
.../org/apache/flink/runtime/rpc/pekko/PekkoUtils.java | 5 +++--
.../flink-rpc-akka/src/main/resources/META-INF/NOTICE | 18 +++++++++---------
4 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/flink-rpc/flink-rpc-akka/pom.xml b/flink-rpc/flink-rpc-akka/pom.xml
index a650d4e99a7..7a2b312ff91 100644
--- a/flink-rpc/flink-rpc-akka/pom.xml
+++ b/flink-rpc/flink-rpc-akka/pom.xml
@@ -37,7 +37,7 @@ under the License.
</description>
<properties>
- <pekko.version>1.0.1</pekko.version>
+ <pekko.version>1.1.2</pekko.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>2.12.16</scala.version>
</properties>
@@ -94,8 +94,8 @@ under the License.
</dependency>
<dependency>
<groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- <version>3.10.6.Final</version>
+ <artifactId>netty-all</artifactId>
+ <scope>test</scope>
<optional>${flink.markBundledAsOptional}</optional>
</dependency>
@@ -172,9 +172,15 @@ under the License.
<include>*</include>
</includes>
</artifactSet>
+ <relocations>
+ <relocation>
+
<pattern>io.netty</pattern>
+
<shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
+ </relocation>
+ </relocations>
<filters>
<filter>
-
<artifact>io.netty:netty</artifact>
+
<artifact>io.netty:*</artifact>
<excludes>
<!-- Only some of these licenses actually apply to the JAR and have been
manually
placed in this module's resources directory. -->
diff --git
a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/ActorSystemBootstrapTools.java
b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/ActorSystemBootstrapTools.java
index 86ccdca9226..517a48669e6 100644
---
a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/ActorSystemBootstrapTools.java
+++
b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/ActorSystemBootstrapTools.java
@@ -122,7 +122,9 @@ public class ActorSystemBootstrapTools {
} catch (Exception e) {
// we can continue to try if this contains a netty channel
exception
Throwable cause = e.getCause();
- if (!(cause instanceof org.jboss.netty.channel.ChannelException
+ if (!(cause
+ instanceof
+
org.apache.flink.shaded.netty4.io.netty.channel.ChannelException
|| cause instanceof java.net.BindException)) {
throw e;
} // else fall through the loop and try the next port
diff --git
a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/PekkoUtils.java
b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/PekkoUtils.java
index 095ae648726..d529c97da33 100644
---
a/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/PekkoUtils.java
+++
b/flink-rpc/flink-rpc-akka/src/main/java/org/apache/flink/runtime/rpc/pekko/PekkoUtils.java
@@ -27,14 +27,15 @@ import org.apache.flink.util.NetUtils;
import org.apache.flink.util.TimeUtils;
import org.apache.flink.util.function.FunctionUtils;
+import
org.apache.flink.shaded.netty4.io.netty.util.internal.logging.InternalLoggerFactory;
+import
org.apache.flink.shaded.netty4.io.netty.util.internal.logging.Slf4JLoggerFactory;
+
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.apache.pekko.actor.ActorRef;
import org.apache.pekko.actor.ActorSystem;
import org.apache.pekko.actor.Address;
import org.apache.pekko.actor.AddressFromURIString;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.logging.Slf4JLoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-rpc/flink-rpc-akka/src/main/resources/META-INF/NOTICE
b/flink-rpc/flink-rpc-akka/src/main/resources/META-INF/NOTICE
index 8e226394996..e8a3772d26a 100644
--- a/flink-rpc/flink-rpc-akka/src/main/resources/META-INF/NOTICE
+++ b/flink-rpc/flink-rpc-akka/src/main/resources/META-INF/NOTICE
@@ -6,17 +6,17 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software
License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- com.hierynomus:asn-one:0.5.0
+- com.hierynomus:asn-one:0.6.0
- com.typesafe:config:1.4.2
- com.typesafe:ssl-config-core_2.12:0.6.1
-- io.netty:netty:3.10.6.Final
-- org.agrona:agrona:1.15.1
-- org.apache.pekko:pekko-actor_2.12:1.0.1
-- org.apache.pekko:pekko-remote_2.12:1.0.1
-- org.apache.pekko:pekko-pki_2.12:1.0.1
-- org.apache.pekko:pekko-protobuf-v3_2.12:1.0.1
-- org.apache.pekko:pekko-slf4j_2.12:1.0.1
-- org.apache.pekko:pekko-stream_2.12:1.0.1
+- io.netty:netty-all:4.1.91.Final
+- org.agrona:agrona:1.22.0
+- org.apache.pekko:pekko-actor_2.12:1.1.2
+- org.apache.pekko:pekko-remote_2.12:1.1.2
+- org.apache.pekko:pekko-pki_2.12:1.1.2
+- org.apache.pekko:pekko-protobuf-v3_2.12:1.1.2
+- org.apache.pekko:pekko-slf4j_2.12:1.1.2
+- org.apache.pekko:pekko-stream_2.12:1.1.2
- org.scala-lang:scala-library:2.12.16
The following dependencies all share the same BSD license which you find under
licenses/LICENSE.scala.
