You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/11/02 11:52:34 UTC
[flink] branch master updated: [FLINK-29626][rpc][build] Update Akka to 2.6.20
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 29069185655 [FLINK-29626][rpc][build] Update Akka to 2.6.20
29069185655 is described below
commit 29069185655261d6c3b998db57aeec7ea23ab505
Author: MartijnVisser <ma...@apache.org>
AuthorDate: Wed Nov 2 12:52:21 2022 +0100
[FLINK-29626][rpc][build] Update Akka to 2.6.20
---
flink-rpc/flink-rpc-akka/pom.xml | 19 ++++++---
.../src/main/resources/META-INF/NOTICE | 45 +++++++++++++++-------
2 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/flink-rpc/flink-rpc-akka/pom.xml b/flink-rpc/flink-rpc-akka/pom.xml
index 7a70eac6f7f..9ce6bcac366 100644
--- a/flink-rpc/flink-rpc-akka/pom.xml
+++ b/flink-rpc/flink-rpc-akka/pom.xml
@@ -33,9 +33,9 @@ under the License.
<packaging>jar</packaging>
<properties>
- <akka.version>2.6.15</akka.version>
+ <akka.version>2.6.20</akka.version>
<scala.binary.version>2.12</scala.binary.version>
- <scala.version>2.12.7</scala.version>
+ <scala.version>2.12.16</scala.version>
</properties>
<dependencies>
@@ -145,10 +145,11 @@ under the License.
<artifactId>scala-reflect</artifactId>
<version>${scala.version}</version>
</dependency>
+ <!-- For dependency convergence in Akka 2.6.20 -->
<dependency>
- <groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
- <version>1.1.2</version>
+ <groupId>com.typesafe</groupId>
+ <artifactId>config</artifactId>
+ <version>1.4.2</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -195,6 +196,14 @@ under the License.
<exclude>META-INF/NOTICE.txt</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>org.scala-lang:*</artifact>
+ <excludes>
+ <!-- For deduplication purposes. -->
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ </excludes>
+ </filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
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 07404314e32..431975e5d50 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
@@ -7,24 +7,24 @@ 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.typesafe:config:1.4.0
-- com.typesafe:ssl-config-core_2.12:0.4.2
-- com.typesafe.akka:akka-actor_2.12:2.6.15
-- com.typesafe.akka:akka-remote_2.12:2.6.15
-- com.typesafe.akka:akka-pki_2.12:2.6.15
-- com.typesafe.akka:akka-protobuf-v3_2.12:2.6.15
-- com.typesafe.akka:akka-slf4j_2.12:2.6.15
-- com.typesafe.akka:akka-stream_2.12:2.6.15
+- com.typesafe:config:1.4.2
+- com.typesafe:ssl-config-core_2.12:0.4.3
+- com.typesafe.akka:akka-actor_2.12:2.6.20
+- com.typesafe.akka:akka-remote_2.12:2.6.20
+- com.typesafe.akka:akka-pki_2.12:2.6.20
+- com.typesafe.akka:akka-protobuf-v3_2.12:2.6.20
+- com.typesafe.akka:akka-slf4j_2.12:2.6.20
+- com.typesafe.akka:akka-stream_2.12:2.6.20
- io.netty:netty:3.10.6.Final
-- org.agrona:agrona:1.9.0
+- org.agrona:agrona:1.15.1
+- org.scala-lang:scala-compiler:2.12.16
+- org.scala-lang:scala-library:2.12.16
+- org.scala-lang:scala-reflect:2.12.16
+- org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2
The following dependencies all share the same BSD license which you find under licenses/LICENSE.scala.
-- org.scala-lang:scala-compiler:2.12.7
-- org.scala-lang:scala-library:2.12.7
-- org.scala-lang:scala-reflect:2.12.7
- org.scala-lang.modules:scala-java8-compat_2.12:0.8.0
-- org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2
- org.scala-lang.modules:scala-xml_2.12:1.0.6
This project bundles the following dependencies under the Creative Commons CC0 "No Rights Reserved".
@@ -64,4 +64,21 @@ WebSocket and HTTP server:
* LICENSE:
* licenses/LICENSE.webbit (BSD License)
* HOMEPAGE:
- * https://github.com/joewalnes/webbit
\ No newline at end of file
+ * https://github.com/joewalnes/webbit
+
+Scala
+Copyright (c) 2002-2022 EPFL
+Copyright (c) 2011-2022 Lightbend, Inc.
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
+
+Licensed under the Apache License, Version 2.0 (the "License").
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+This software includes projects with other licenses -- see `doc/LICENSE.md`.