From 31cd053f30b7c2ed1511a59d7b0aa486c1d1eed5 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 Dec 2021 12:52:55 +0100 Subject: [PATCH] Bump akka to 2.6.18 https://akka.io/blog/news/2021/12/20/akka-2.6.18-released JIRA: CONTROLLER-2027 Change-Id: I7ec7581f48610d8d8479e971186a16d6b870ed9c Signed-off-by: Robert Varga (cherry picked from commit 6cdbf02bf11ece7ef75e5d4d1982c71c00e8cebf) --- akka/repackaged-akka-jar/pom.xml | 16 ++++++++-------- .../src/main/resources/remote_reference.conf | 5 +++-- bundle-parent/pom.xml | 10 +++++----- docs/pom.xml | 2 +- .../src/main/history/dependencies.xml | 6 +++--- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml index cbff98fbc8..a3dba1c265 100644 --- a/akka/repackaged-akka-jar/pom.xml +++ b/akka/repackaged-akka-jar/pom.xml @@ -33,42 +33,42 @@ com.typesafe.akka akka-actor_2.13 - 2.6.17 + 2.6.18 com.typesafe.akka akka-cluster_2.13 - 2.6.17 + 2.6.18 com.typesafe.akka akka-osgi_2.13 - 2.6.17 + 2.6.18 com.typesafe.akka akka-persistence_2.13 - 2.6.17 + 2.6.18 com.typesafe.akka akka-protobuf_2.13 - 2.6.17 + 2.6.18 com.typesafe.akka akka-remote_2.13 - 2.6.17 + 2.6.18 com.typesafe.akka akka-slf4j_2.13 - 2.6.17 + 2.6.18 com.typesafe.akka akka-stream_2.13 - 2.6.17 + 2.6.18 diff --git a/akka/repackaged-akka-jar/src/main/resources/remote_reference.conf b/akka/repackaged-akka-jar/src/main/resources/remote_reference.conf index 814540e554..20f95ebb58 100644 --- a/akka/repackaged-akka-jar/src/main/resources/remote_reference.conf +++ b/akka/repackaged-akka-jar/src/main/resources/remote_reference.conf @@ -852,8 +852,9 @@ akka { buffer-pool-size = 128 # Maximum serialized message size for the large messages, including header data. - # It is currently restricted to 1/8th the size of a term buffer that can be - # configured by setting the 'aeron.term.buffer.length' system property. + # If the value of akka.remote.artery.transport is set to aeron-udp, it is currently + # restricted to 1/8th the size of a term buffer that can be configured by setting the + # 'aeron.term.buffer.length' system property. # See 'large-message-destinations'. maximum-large-frame-size = 2 MiB diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 704bad4cb3..c8f0044384 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -75,7 +75,7 @@ com.typesafe.akka akka-testkit_2.13 - 2.6.17 + 2.6.18 test @@ -87,7 +87,7 @@ com.typesafe.akka akka-persistence-tck_2.13 - 2.6.17 + 2.6.18 test @@ -108,17 +108,17 @@ org.agrona agrona - 1.9.0 + 1.14.0 io.aeron aeron-client - 1.32.0 + 1.37.0 io.aeron aeron-driver - 1.32.0 + 1.37.0 diff --git a/docs/pom.xml b/docs/pom.xml index da876e5403..9975942021 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -242,7 +242,7 @@ http://google.github.io/truth/api/1.0.1/ http://www.slf4j.org/apidocs/ https://google.github.io/guava/releases/29.0-jre/api/docs/ - http://doc.akka.io/japi/akka/2.6.17/ + http://doc.akka.io/japi/akka/2.6.18/ http://netty.io/4.1/api/ https://commons.apache.org/proper/commons-lang/javadocs/api-2.6/ https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/ diff --git a/features/odl-controller-akka/src/main/history/dependencies.xml b/features/odl-controller-akka/src/main/history/dependencies.xml index 3ced644ac4..93c73af596 100644 --- a/features/odl-controller-akka/src/main/history/dependencies.xml +++ b/features/odl-controller-akka/src/main/history/dependencies.xml @@ -4,10 +4,10 @@ odl-controller-scala mvn:com.typesafe/config/1.4.0 mvn:com.typesafe/ssl-config-core_2.13/0.4.2 - mvn:io.aeron/aeron-client/1.32.0 - mvn:io.aeron/aeron-driver/1.32.0 + mvn:io.aeron/aeron-client/1.37.0 + mvn:io.aeron/aeron-driver/1.37.0 mvn:io.netty/netty/3.10.6.Final - mvn:org.agrona/agrona/1.9.0 + mvn:org.agrona/agrona/1.14.0 mvn:org.opendaylight.controller/repackaged-akka/${project.version} mvn:org.reactivestreams/reactive-streams/1.0.3 -- 2.36.6