diff --git a/flink-rpc/flink-rpc-akka/pom.xml b/flink-rpc/flink-rpc-akka/pom.xml index e04a667eec2ed..4ac2028db94db 100644 --- a/flink-rpc/flink-rpc-akka/pom.xml +++ b/flink-rpc/flink-rpc-akka/pom.xml @@ -37,7 +37,7 @@ under the License. - 1.1.2 + 1.0.1 2.12 2.12.16 @@ -94,8 +94,8 @@ under the License. io.netty - netty-all - test + netty + 3.10.6.Final ${flink.markBundledAsOptional} @@ -172,15 +172,9 @@ under the License. * - - - io.netty - org.apache.flink.shaded.netty4.io.netty - - - io.netty:* + io.netty:netty 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 517a48669e688..86ccdca92260e 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,9 +122,7 @@ public static ActorSystem startRemoteActorSystem( } catch (Exception e) { // we can continue to try if this contains a netty channel exception Throwable cause = e.getCause(); - if (!(cause - instanceof - org.apache.flink.shaded.netty4.io.netty.channel.ChannelException + if (!(cause instanceof org.jboss.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 2825c834ffc5b..7571c078f8f15 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,15 +27,14 @@ 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 e8a3772d26af8..8e22639499679 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.6.0 +- com.hierynomus:asn-one:0.5.0 - com.typesafe:config:1.4.2 - com.typesafe:ssl-config-core_2.12:0.6.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 +- 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 - org.scala-lang:scala-library:2.12.16 The following dependencies all share the same BSD license which you find under licenses/LICENSE.scala.