From 3d68f533d303f4733d3516fdd69425734d0171a9 Mon Sep 17 00:00:00 2001 From: Sebastian Alfers Date: Mon, 23 Sep 2024 16:07:40 +0200 Subject: [PATCH] chore: bump to akka 2.10.0-M1, align with changes from upstream (#4424) --- .scala-steward.conf | 4 +- .../src/main/scala/akka/BenchRunner.scala | 2 +- .../scala/akka/http/caching/LfuCache.scala | 2 +- .../akka/http/caching/scaladsl/Cache.scala | 2 +- .../main/java/akka/http/impl/util/Util.java | 2 +- .../akka/http/javadsl/model/Multiparts.java | 2 +- .../akka/http/ccompat/MapHelpers.scala | 2 +- .../akka/http/ccompat/MapHelpers.scala | 2 +- .../client/pool/NewHostConnectionPool.scala | 2 +- .../akka/http/impl/model/JavaQuery.scala | 2 +- .../impl/settings/ParserSettingsImpl.scala | 2 +- .../akka/http/impl/util/JavaMapping.scala | 2 +- .../impl/util/SettingsCompanionImpl.scala | 4 +- .../main/scala/akka/http/javadsl/Http.scala | 2 +- .../settings/ClientConnectionSettings.scala | 2 +- .../settings/ConnectionPoolSettings.scala | 2 +- .../javadsl/settings/ParserSettings.scala | 2 +- .../javadsl/settings/ServerSettings.scala | 2 +- .../http/scaladsl/ConnectionContext.scala | 8 ---- .../akka/http/scaladsl/model/Multipart.scala | 2 +- .../model/ws/UpgradeToWebSocket.scala | 2 +- .../scaladsl/model/ws/WebSocketUpgrade.scala | 2 +- .../settings/ConnectionPoolSettings.scala | 2 +- .../scaladsl/settings/ParserSettings.scala | 2 +- .../scaladsl/settings/ServerSettings.scala | 2 +- .../akka/http/javadsl/model/JavaApiSpec.scala | 2 +- .../test/scala/akka/testkit/AkkaSpec.scala | 2 +- .../javadsl/testkit/TestRouteResult.scala | 2 +- .../testkit/WSTestRequestBuilding.scala | 3 +- .../akka/remote/testkit/MultiNodeConfig.scala | 4 +- .../http/scaladsl/server/RejectionSpec.scala | 2 +- .../sse/EventStreamUnmarshallingSpec.scala | 5 +-- .../server/JavaPathMatchers.scala.template | 2 +- .../javadsl/common/SSLContextFactory.scala | 2 +- .../http/javadsl/server/PathMatchers.scala | 2 +- .../javadsl/server/RejectionHandler.scala | 2 +- .../akka/http/javadsl/server/Rejections.scala | 2 +- .../server/directives/CodingDirectives.scala | 2 +- .../server/directives/CookieDirectives.scala | 2 +- .../directives/DebuggingDirectives.scala | 2 +- .../FileAndResourceDirectives.scala | 2 +- .../directives/FormFieldDirectives.scala | 2 +- .../server/directives/HostDirectives.scala | 2 +- .../server/directives/MiscDirectives.scala | 2 +- .../directives/ParameterDirectives.scala | 2 +- .../directives/WebSocketDirectives.scala | 2 +- .../javadsl/unmarshalling/Unmarshaller.scala | 2 +- .../akka/http/scaladsl/server/Rejection.scala | 2 +- .../http/scaladsl/server/RouteResult.scala | 2 +- .../FileAndResourceDirectives.scala | 2 +- .../src/main/paradox/migration-guide/index.md | 1 + .../migration-guide/migration-guide-10.7.x.md | 42 +++++++++++++++++++ docs/src/main/paradox/release-notes/10.7.x.md | 9 ++++ docs/src/main/paradox/release-notes/index.md | 1 + .../docs/ApiMayChangeDocCheckerSpec.scala | 2 +- native-image-tests/build.sbt | 4 +- project/AkkaDependency.scala | 2 +- project/Dependencies.scala | 2 +- project/MultiNode.scala | 2 +- project/ParadoxSupport.scala | 2 +- samples/akka-http-quickstart-java/pom.xml | 4 +- samples/akka-http-quickstart-scala/build.sbt | 2 +- 62 files changed, 117 insertions(+), 72 deletions(-) create mode 100644 docs/src/main/paradox/migration-guide/migration-guide-10.7.x.md create mode 100644 docs/src/main/paradox/release-notes/10.7.x.md diff --git a/.scala-steward.conf b/.scala-steward.conf index 8c87b030d18..82828a74d84 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -18,8 +18,8 @@ updates.pin = [ # Align with Scalatest dependency from Akka TestKit does { groupId = "org.scalatest", artifactId = "scalatest", version = "3.2." }, # align with Akka jackson version - { groupId = "com.fasterxml.jackson.core", version = "2.15." }, - { groupId = "com.fasterxml.jackson.dataformat", version = "2.15." }, + { groupId = "com.fasterxml.jackson.core", version = "2.17." }, + { groupId = "com.fasterxml.jackson.dataformat", version = "2.17." }, # https://github.com/akka/akka-http/pull/3996#issuecomment-1009953070 { groupId = "org.specs2", artifactId = "specs2-core", version = "4.10." }, # https://github.com/akka/akka-http/pull/4080#issuecomment-1074853622 diff --git a/akka-http-bench-jmh/src/main/scala/akka/BenchRunner.scala b/akka-http-bench-jmh/src/main/scala/akka/BenchRunner.scala index 2f45d9470a6..848c55021fe 100644 --- a/akka-http-bench-jmh/src/main/scala/akka/BenchRunner.scala +++ b/akka-http-bench-jmh/src/main/scala/akka/BenchRunner.scala @@ -11,7 +11,7 @@ import org.openjdk.jmh.runner.options.CommandLineOptions object BenchRunner { def main(args: Array[String]): Unit = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ // @formatter:off val args2 = args.toList.flatMap { diff --git a/akka-http-caching/src/main/scala/akka/http/caching/LfuCache.scala b/akka-http-caching/src/main/scala/akka/http/caching/LfuCache.scala index 8b112d64dc4..5ee85776b73 100755 --- a/akka-http-caching/src/main/scala/akka/http/caching/LfuCache.scala +++ b/akka-http-caching/src/main/scala/akka/http/caching/LfuCache.scala @@ -10,9 +10,9 @@ import java.util.function.BiFunction import akka.actor.ActorSystem import akka.annotation.{ ApiMayChange, InternalApi } -import scala.collection.JavaConverters._ import scala.concurrent.duration.Duration import scala.concurrent.{ ExecutionContext, Future } +import scala.jdk.CollectionConverters._ import com.github.benmanes.caffeine.cache.{ AsyncCache, Caffeine } import akka.http.caching.LfuCache.toJavaMappingFunction import akka.http.caching.scaladsl.Cache diff --git a/akka-http-caching/src/main/scala/akka/http/caching/scaladsl/Cache.scala b/akka-http-caching/src/main/scala/akka/http/caching/scaladsl/Cache.scala index 51f59085149..59fb8500cdd 100755 --- a/akka-http-caching/src/main/scala/akka/http/caching/scaladsl/Cache.scala +++ b/akka-http-caching/src/main/scala/akka/http/caching/scaladsl/Cache.scala @@ -10,9 +10,9 @@ import java.util.concurrent.{ CompletableFuture, CompletionStage } import akka.annotation.{ ApiMayChange, DoNotInherit } import akka.japi.{ Creator, Procedure } -import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.{ ExecutionContext, Future, Promise } +import scala.jdk.CollectionConverters._ import scala.jdk.FutureConverters._ /** diff --git a/akka-http-core/src/main/java/akka/http/impl/util/Util.java b/akka-http-core/src/main/java/akka/http/impl/util/Util.java index ca4b1a9ea87..a0ba2796825 100644 --- a/akka-http-core/src/main/java/akka/http/impl/util/Util.java +++ b/akka-http-core/src/main/java/akka/http/impl/util/Util.java @@ -55,7 +55,7 @@ public static scala.Option scalaNone() { @SuppressWarnings("unchecked") public static Seq convertIterable(Iterable els) { - return scala.collection.JavaConverters.iterableAsScalaIterableConverter((Iterable)els).asScala().toVector(); + return scala.jdk.javaapi.CollectionConverters.asScala((Iterable)els).toVector(); } public static Seq convertArray(T[] els) { return Util.convertIterable(Arrays.asList(els)); diff --git a/akka-http-core/src/main/java/akka/http/javadsl/model/Multiparts.java b/akka-http-core/src/main/java/akka/http/javadsl/model/Multiparts.java index c14abfe2027..8c3425f1cb3 100644 --- a/akka-http-core/src/main/java/akka/http/javadsl/model/Multiparts.java +++ b/akka-http-core/src/main/java/akka/http/javadsl/model/Multiparts.java @@ -145,6 +145,6 @@ private static scala.collection.immutable.Map toScala } private static scala.collection.Iterable toScalaSeq(java.util.List _headers) { - return scala.collection.JavaConverters.collectionAsScalaIterableConverter(_headers).asScala(); + return scala.jdk.javaapi.CollectionConverters.asScala(_headers); } } diff --git a/akka-http-core/src/main/scala-2.13+/akka/http/ccompat/MapHelpers.scala b/akka-http-core/src/main/scala-2.13+/akka/http/ccompat/MapHelpers.scala index 384ad85afe8..1e45f061562 100644 --- a/akka-http-core/src/main/scala-2.13+/akka/http/ccompat/MapHelpers.scala +++ b/akka-http-core/src/main/scala-2.13+/akka/http/ccompat/MapHelpers.scala @@ -6,7 +6,7 @@ package akka.http.ccompat object MapHelpers { def convertMapToScala[K, V](jmap: java.util.Map[K, V]): scala.collection.immutable.Map[K, V] = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ Map.empty.concat(jmap.asScala) } } diff --git a/akka-http-core/src/main/scala-2.13-/akka/http/ccompat/MapHelpers.scala b/akka-http-core/src/main/scala-2.13-/akka/http/ccompat/MapHelpers.scala index 602f22630fe..441ce0a0ee7 100644 --- a/akka-http-core/src/main/scala-2.13-/akka/http/ccompat/MapHelpers.scala +++ b/akka-http-core/src/main/scala-2.13-/akka/http/ccompat/MapHelpers.scala @@ -9,7 +9,7 @@ package akka.http.ccompat */ object MapHelpers { def convertMapToScala[K, V](jmap: java.util.Map[K, V]): scala.collection.immutable.Map[K, V] = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ Map.empty ++ jmap.asScala } } diff --git a/akka-http-core/src/main/scala/akka/http/impl/engine/client/pool/NewHostConnectionPool.scala b/akka-http-core/src/main/scala/akka/http/impl/engine/client/pool/NewHostConnectionPool.scala index 4c69d88491e..2588adc92c8 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/engine/client/pool/NewHostConnectionPool.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/engine/client/pool/NewHostConnectionPool.scala @@ -23,9 +23,9 @@ import akka.stream.stage.{ GraphStage, GraphStageLogic, InHandler, OutHandler } import akka.util.OptionVal import scala.concurrent.ExecutionContext -import scala.collection.JavaConverters._ import scala.concurrent.Future import scala.concurrent.duration._ +import scala.jdk.CollectionConverters._ import scala.util.control.{ NoStackTrace, NonFatal } import scala.util.{ Failure, Random, Success, Try } diff --git a/akka-http-core/src/main/scala/akka/http/impl/model/JavaQuery.scala b/akka-http-core/src/main/scala/akka/http/impl/model/JavaQuery.scala index 57b586dff35..d49480563e2 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/model/JavaQuery.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/model/JavaQuery.scala @@ -17,7 +17,7 @@ import akka.http.scaladsl.{ model => sm } import akka.japi.Pair import akka.parboiled2.CharPredicate -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.impl.util.JavaMapping.Implicits._ /** INTERNAL API */ diff --git a/akka-http-core/src/main/scala/akka/http/impl/settings/ParserSettingsImpl.scala b/akka-http-core/src/main/scala/akka/http/impl/settings/ParserSettingsImpl.scala index 49c8804ccb0..be3cce8f9ff 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/settings/ParserSettingsImpl.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/settings/ParserSettingsImpl.scala @@ -9,7 +9,7 @@ import akka.http.scaladsl.settings.ParserSettings.{ ConflictingContentTypeHeader import akka.util.ConstantFun import com.typesafe.config.Config -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.scaladsl.model._ import akka.http.impl.util._ import akka.http.scaladsl.settings.ParserSettings diff --git a/akka-http-core/src/main/scala/akka/http/impl/util/JavaMapping.scala b/akka-http-core/src/main/scala/akka/http/impl/util/JavaMapping.scala index d071c1871ae..22f145d5f5f 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/util/JavaMapping.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/JavaMapping.scala @@ -110,7 +110,7 @@ private[http] object JavaMapping { } implicit def map[K, V]: JavaMapping[ju.Map[K, V], immutable.Map[K, V]] = new JavaMapping[ju.Map[K, V], immutable.Map[K, V]] { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ def toScala(javaObject: ju.Map[K, V]): immutable.Map[K, V] = javaObject.asScala.toMap def toJava(scalaObject: immutable.Map[K, V]): ju.Map[K, V] = scalaObject.asJava } diff --git a/akka-http-core/src/main/scala/akka/http/impl/util/SettingsCompanionImpl.scala b/akka-http-core/src/main/scala/akka/http/impl/util/SettingsCompanionImpl.scala index 406c2594cbe..3c9355d2233 100644 --- a/akka-http-core/src/main/scala/akka/http/impl/util/SettingsCompanionImpl.scala +++ b/akka-http-core/src/main/scala/akka/http/impl/util/SettingsCompanionImpl.scala @@ -9,9 +9,9 @@ import java.net.{ InetAddress, InetSocketAddress } import com.typesafe.config.{ Config, ConfigFactory } import com.typesafe.config.ConfigFactory._ -import scala.util.control.NonFatal import scala.collection.immutable.ListMap -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ +import scala.util.control.NonFatal import akka.actor.{ ActorRefFactory, ActorSystem } import akka.annotation.InternalApi diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala index 52662667fbd..5512c52a68b 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/Http.scala @@ -38,7 +38,7 @@ object Http extends ExtensionId[Http] with ExtensionIdProvider { } class Http(system: ExtendedActorSystem) extends akka.actor.Extension { - import akka.dispatch.ExecutionContexts.{ parasitic => ec } + import scala.concurrent.ExecutionContext.{ parasitic => ec } import language.implicitConversions private implicit def completionStageCovariant[T, U >: T](in: CompletionStage[T]): CompletionStage[U] = in.asInstanceOf[CompletionStage[U]] diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala index c2eab941480..33e935dc610 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ClientConnectionSettings.scala @@ -18,8 +18,8 @@ import akka.io.Inet.SocketOption import com.typesafe.config.Config import akka.http.impl.util.JavaMapping.Implicits._ -import scala.collection.JavaConverters._ import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ /** diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala index e3b3c1f595f..5c1f08123ad 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ConnectionPoolSettings.scala @@ -42,7 +42,7 @@ abstract class ConnectionPoolSettings private[akka] () { self: ConnectionPoolSet @ApiMayChange def withHostOverrides(hostOverrides: java.util.List[(String, ConnectionPoolSettings)]): ConnectionPoolSettings = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ self.copy(hostOverrides = hostOverrides.asScala.toList.map { case (h, s) => ConnectionPoolSettingsImpl.hostRegex(h) -> s.asScala }) } diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala index 556970cdcb7..4c1484f1828 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ParserSettings.scala @@ -15,7 +15,7 @@ import akka.annotation.DoNotInherit import akka.http.impl.util.JavaMapping.Implicits._ import scala.annotation.varargs -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.javadsl.model.{ HttpMethod, MediaType, StatusCode, Uri } import scala.annotation.nowarn import com.typesafe.config.Config diff --git a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala index e3ba6f33b7b..ef71c7e9af1 100644 --- a/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/javadsl/settings/ServerSettings.scala @@ -16,8 +16,8 @@ import akka.io.Inet.SocketOption import akka.http.impl.util.JavaMapping.Implicits._ import com.typesafe.config.Config -import scala.collection.JavaConverters._ import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ /** diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/ConnectionContext.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/ConnectionContext.scala index 66b7c11e559..c24719358aa 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/ConnectionContext.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/ConnectionContext.scala @@ -4,17 +4,9 @@ package akka.http.scaladsl -import java.util.{ Optional, Collection => JCollection } - import akka.annotation.{ ApiMayChange, InternalApi } -import akka.stream.TLSClientAuth -import akka.stream.TLSProtocol._ import javax.net.ssl._ -import scala.collection.JavaConverters._ -import scala.collection.immutable -import scala.jdk.OptionConverters._ - trait ConnectionContext extends akka.http.javadsl.ConnectionContext { /** INTERNAL API */ @InternalApi diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala index cfd471170c7..c0858539ea9 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/Multipart.scala @@ -12,7 +12,7 @@ import java.util.concurrent.CompletionStage import scala.concurrent.duration.FiniteDuration import scala.concurrent.Future import scala.collection.immutable -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.jdk.FutureConverters._ import scala.util.{ Failure, Success, Try } diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/UpgradeToWebSocket.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/UpgradeToWebSocket.scala index 3e3dff2e0ae..0618275323f 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/UpgradeToWebSocket.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/UpgradeToWebSocket.scala @@ -55,7 +55,7 @@ trait UpgradeToWebSocket extends jm.ws.UpgradeToWebSocket with WebSocketUpgrade subprotocol: Option[String] = None): HttpResponse = handleMessages(scaladsl.Flow.fromSinkAndSource(inSink, outSource), subprotocol) - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ /** * Java API diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/WebSocketUpgrade.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/WebSocketUpgrade.scala index 0d021312415..c60b023b528 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/WebSocketUpgrade.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/model/ws/WebSocketUpgrade.scala @@ -57,7 +57,7 @@ trait WebSocketUpgrade extends jm.ws.WebSocketUpgrade { subprotocol: Option[String] = None): HttpResponse = handleMessages(scaladsl.Flow.fromSinkAndSource(inSink, outSource), subprotocol) - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ /** * Java API diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ConnectionPoolSettings.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ConnectionPoolSettings.scala index ed99a50e29a..4aa3f4b4d93 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ConnectionPoolSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ConnectionPoolSettings.scala @@ -87,7 +87,7 @@ abstract class ConnectionPoolSettings extends js.ConnectionPoolSettings { self: object ConnectionPoolSettings extends SettingsCompanion[ConnectionPoolSettings] { override def apply(config: Config): ConnectionPoolSettingsImpl = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val hostOverrides = config.getConfigList("akka.http.host-connection-pool.per-host-override").asScala.toList.map { cfg => ConnectionPoolSettingsImpl.hostRegex(cfg.getString("host-pattern")) -> diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala index f186944cac9..42d31b5600b 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ParserSettings.scala @@ -17,7 +17,7 @@ import akka.http.scaladsl.model._ import akka.http.scaladsl.{ settings => js } import com.typesafe.config.Config -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ /** diff --git a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala index 9720a7f9e6a..89456951d02 100644 --- a/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala +++ b/akka-http-core/src/main/scala/akka/http/scaladsl/settings/ServerSettings.scala @@ -19,9 +19,9 @@ import akka.http.scaladsl.model.headers.{ Host, Server } import akka.io.Inet.SocketOption import com.typesafe.config.Config -import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.duration.{ Duration, FiniteDuration } +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ import scala.language.implicitConversions diff --git a/akka-http-core/src/test/scala/akka/http/javadsl/model/JavaApiSpec.scala b/akka-http-core/src/test/scala/akka/http/javadsl/model/JavaApiSpec.scala index 82d29ee0292..a4aa72f8f82 100644 --- a/akka-http-core/src/test/scala/akka/http/javadsl/model/JavaApiSpec.scala +++ b/akka-http-core/src/test/scala/akka/http/javadsl/model/JavaApiSpec.scala @@ -8,8 +8,8 @@ import java.util.Optional import akka.japi.Pair -import scala.collection.JavaConverters._ import scala.collection.mutable +import scala.jdk.CollectionConverters._ import org.scalatest.freespec.AnyFreeSpec import org.scalatest.matchers.must.Matchers diff --git a/akka-http-core/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-http-core/src/test/scala/akka/testkit/AkkaSpec.scala index 8f269ec4db0..0f249868c70 100644 --- a/akka-http-core/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-http-core/src/test/scala/akka/testkit/AkkaSpec.scala @@ -40,7 +40,7 @@ object AkkaSpec { """) def mapToConfig(map: Map[String, Any]): Config = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory.parseMap(map.asJava) } diff --git a/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala b/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala index bf189328305..ec1bb62529d 100644 --- a/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala +++ b/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/TestRouteResult.scala @@ -21,8 +21,8 @@ import akka.http.javadsl.server.{ Rejection, RoutingJavaMapping } import RoutingJavaMapping._ import akka.http.javadsl.model._ -import scala.collection.JavaConverters._ import scala.annotation.varargs +import scala.jdk.CollectionConverters._ /** * A wrapper for route results. diff --git a/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/WSTestRequestBuilding.scala b/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/WSTestRequestBuilding.scala index 2f11e59dbe4..a30a2810db9 100644 --- a/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/WSTestRequestBuilding.scala +++ b/akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/WSTestRequestBuilding.scala @@ -12,9 +12,10 @@ import akka.stream.javadsl.Flow import akka.http.scaladsl.{ testkit => st } import akka.http.impl.util.JavaMapping.Implicits._ -import scala.collection.JavaConverters._ import akka.stream.{ Materializer, scaladsl } +import scala.jdk.CollectionConverters._ + trait WSTestRequestBuilding { def WS[T](uri: Uri, clientSideHandler: Flow[Message, Message, T], materializer: Materializer): HttpRequest = { diff --git a/akka-http-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeConfig.scala b/akka-http-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeConfig.scala index e027dfb1e4d..c0d7521cb4e 100644 --- a/akka-http-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeConfig.scala +++ b/akka-http-tests/src/multi-jvm/scala/akka/remote/testkit/MultiNodeConfig.scala @@ -230,7 +230,7 @@ object MultiNodeSpec { """) private def mapToConfig(map: Map[String, Any]): Config = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory.parseMap(map.asJava) } @@ -430,7 +430,7 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles: base.replace(tag, replaceWith) } } - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ ConfigFactory.parseString(deployString).root.asScala foreach { case (key, value: ConfigObject) => deployer.parseConfig(key, value.toConfig) foreach deployer.deploy case (key, x) => throw new IllegalArgumentException(s"key $key must map to deployment section, not simple value $x") diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/RejectionSpec.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/RejectionSpec.scala index 29b1ab6507c..6aa7b5f5de7 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/server/RejectionSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/server/RejectionSpec.scala @@ -4,7 +4,7 @@ package akka.http.scaladsl.server -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ class RejectionSpec extends RoutingSpec { diff --git a/akka-http-tests/src/test/scala/akka/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala b/akka-http-tests/src/test/scala/akka/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala index de14803c96b..b0b0d7e8006 100644 --- a/akka-http-tests/src/test/scala/akka/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala +++ b/akka-http-tests/src/test/scala/akka/http/scaladsl/unmarshalling/sse/EventStreamUnmarshallingSpec.scala @@ -15,11 +15,11 @@ import akka.http.scaladsl.settings.ServerSentEventSettings import akka.stream.scaladsl.{ Sink, Source } import java.util.{ List => JList } -import scala.collection.JavaConverters -import scala.collection.immutable.Seq import org.scalatest.matchers.should.Matchers import org.scalatest.wordspec.AsyncWordSpec +import scala.jdk.CollectionConverters._ + object EventStreamUnmarshallingSpec { val events: Seq[ServerSentEvent] = @@ -27,7 +27,6 @@ object EventStreamUnmarshallingSpec { // Also used by EventStreamUnmarshallingTest.java val eventsAsJava: JList[javadsl.model.sse.ServerSentEvent] = { - import JavaConverters._ events.map(_.asInstanceOf[javadsl.model.sse.ServerSentEvent]).asJava } diff --git a/akka-http/src/main/boilerplate/akka/http/javadsl/server/JavaPathMatchers.scala.template b/akka-http/src/main/boilerplate/akka/http/javadsl/server/JavaPathMatchers.scala.template index e6c0cdf65ff..f4cc540ff8e 100644 --- a/akka-http/src/main/boilerplate/akka/http/javadsl/server/JavaPathMatchers.scala.template +++ b/akka-http/src/main/boilerplate/akka/http/javadsl/server/JavaPathMatchers.scala.template @@ -8,7 +8,7 @@ import akka.http.scaladsl.server.{ PathMatcher => SPathMatcher } import akka.http.scaladsl.server.{ PathMatchers => SPathMatchers } import java.util.{ List => JList } import java.util.function.{ Function => JFunction } -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ object JavaPathMatchers { diff --git a/akka-http/src/main/scala/akka/http/javadsl/common/SSLContextFactory.scala b/akka-http/src/main/scala/akka/http/javadsl/common/SSLContextFactory.scala index f1bbe714188..bcbcc86c8ec 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/common/SSLContextFactory.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/common/SSLContextFactory.scala @@ -17,8 +17,8 @@ import java.security.SecureRandom import java.time.Duration import java.util.Optional import javax.net.ssl.SSLEngine -import scala.jdk.DurationConverters._ import scala.jdk.CollectionConverters._ +import scala.jdk.DurationConverters._ import scala.jdk.OptionConverters.RichOptional object SSLContextFactory { diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala b/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala index 40ad2580d6a..288109d9bc0 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/PathMatchers.scala @@ -9,7 +9,7 @@ import java.util.regex.Pattern import akka.http.scaladsl.model.Uri.Path -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.scaladsl.server.{ PathMatcher => SPathMatcher } import akka.http.scaladsl.server.{ PathMatchers => SPathMatchers } diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/RejectionHandler.scala b/akka-http/src/main/scala/akka/http/javadsl/server/RejectionHandler.scala index 3a3694dd92a..8b450f0b1c6 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/RejectionHandler.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/RejectionHandler.scala @@ -10,8 +10,8 @@ import java.util.function import akka.http.javadsl.model.HttpResponse +import scala.jdk.CollectionConverters._ import scala.reflect.ClassTag -import scala.collection.JavaConverters._ object RejectionHandler { /** diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala b/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala index f30bafe4625..aee3160ae11 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/Rejections.scala @@ -20,7 +20,7 @@ import java.util.function.{ Function => JFunction } import java.util.{ List => JList } import scala.collection.immutable -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ /** diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala index 8f35624378a..59c0f040193 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CodingDirectives.scala @@ -7,7 +7,7 @@ package directives import java.util.function.Supplier -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.impl.util.JavaMapping.Implicits._ import akka.http.javadsl.coding.Coder import akka.http.javadsl.model.headers.HttpEncoding diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CookieDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CookieDirectives.scala index 7471ee0051a..5fc6d611ac0 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/CookieDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/CookieDirectives.scala @@ -9,7 +9,7 @@ import java.util.Optional import java.util.function.{ Function => JFunction } import java.util.function.Supplier -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.impl.util.JavaMapping.Implicits._ import akka.http.javadsl.model.headers.HttpCookie diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala index bccc6e1887c..c80bd3cd9a3 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/DebuggingDirectives.scala @@ -15,7 +15,7 @@ import akka.http.scaladsl import akka.http.scaladsl.server.directives.LoggingMagnet import akka.http.scaladsl.server.{ RouteResult, Directives => D } -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ abstract class DebuggingDirectives extends CookieDirectives { import akka.http.impl.util.JavaMapping.Implicits._ diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala index 014ad7690cc..2b81bffb8ce 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FileAndResourceDirectives.scala @@ -9,7 +9,7 @@ import java.io.File import akka.http.javadsl.marshalling.Marshaller import scala.annotation.varargs -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.javadsl.model.ContentType import akka.http.javadsl.model.RequestEntity import akka.http.javadsl.server.{ Route, RoutingJavaMapping } diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala index 7f2545780cb..638ce0acdba 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/FormFieldDirectives.scala @@ -11,7 +11,7 @@ import java.util.function.{ Function => JFunction } import akka.http.javadsl.unmarshalling.Unmarshaller -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.impl.util.JavaMapping.Implicits._ import akka.http.javadsl.server.Route diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala index 628fe4b434e..b77cd79d5f0 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/HostDirectives.scala @@ -11,7 +11,7 @@ import java.util.function.Predicate import java.util.function.Supplier import java.util.regex.Pattern -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.javadsl.common.RegexConverters.toScala import akka.http.scaladsl.server.{ Directives => D } diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala index ed01b16fd98..1681851103c 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/MiscDirectives.scala @@ -10,7 +10,7 @@ import java.util.function.BooleanSupplier import java.util.function.{ Function => JFunction } import java.util.function.Supplier -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import akka.http.javadsl.model.RemoteAddress import akka.http.javadsl.model.headers.Language diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala index f806c0bca84..44cad9d1c1d 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/ParameterDirectives.scala @@ -13,7 +13,7 @@ import akka.http.javadsl.unmarshalling.Unmarshaller import akka.http.scaladsl.server.directives.ParameterDirectives._ import akka.http.scaladsl.server.directives.{ ParameterDirectives => D } -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ abstract class ParameterDirectives extends MiscDirectives { diff --git a/akka-http/src/main/scala/akka/http/javadsl/server/directives/WebSocketDirectives.scala b/akka-http/src/main/scala/akka/http/javadsl/server/directives/WebSocketDirectives.scala index 4728a7fbb6f..5debd451041 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/server/directives/WebSocketDirectives.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/server/directives/WebSocketDirectives.scala @@ -49,7 +49,7 @@ abstract class WebSocketDirectives extends SecurityDirectives { * this is a WebSocket request. Rejects with an [[ExpectedWebSocketRequestRejection]], otherwise. */ def extractOfferedWsProtocols(inner: JFunction[JList[String], Route]): Route = RouteAdapter { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ D.extractOfferedWsProtocols { (list: Seq[String]) => inner.apply(list.asJava).delegate } diff --git a/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala b/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala index 4af5565842c..7f7023c831a 100644 --- a/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala +++ b/akka-http/src/main/scala/akka/http/javadsl/unmarshalling/Unmarshaller.scala @@ -21,8 +21,8 @@ import akka.stream.{ Materializer, SystemMaterializer } import akka.util.ByteString import scala.annotation.nowarn -import scala.collection.JavaConverters._ import scala.concurrent.ExecutionContext +import scala.jdk.CollectionConverters._ import scala.jdk.FutureConverters._ object Unmarshaller extends akka.http.javadsl.unmarshalling.Unmarshallers { diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala index 0a36b36ac31..4d94b680b00 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala @@ -19,8 +19,8 @@ import akka.http.javadsl.model.headers.{ HttpOrigin => JHttpOrigin } import akka.http.scaladsl.model.headers.{ HttpOrigin => SHttpOrigin } import java.util.{ List => JList } -import scala.collection.JavaConverters._ import scala.collection.immutable +import scala.jdk.CollectionConverters._ import scala.jdk.OptionConverters._ import scala.runtime.AbstractFunction1 diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/RouteResult.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/RouteResult.scala index 43a03ed2382..3e0ebc60d67 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/RouteResult.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/RouteResult.scala @@ -12,9 +12,9 @@ import akka.http.scaladsl.settings.{ ParserSettings, RoutingSettings } import akka.stream.{ ActorMaterializerHelper, Materializer } import akka.stream.scaladsl.Flow -import scala.collection.JavaConverters._ import scala.collection.immutable import scala.concurrent.{ ExecutionContext, ExecutionContextExecutor, Future } +import scala.jdk.CollectionConverters._ /** * The result of handling a request. diff --git a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala index f01779788a7..10d9ed16003 100644 --- a/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala +++ b/akka-http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala @@ -20,7 +20,7 @@ import akka.http.scaladsl.model.headers._ import akka.http.impl.util._ import akka.http.javadsl -import scala.collection.JavaConverters._ +import scala.jdk.CollectionConverters._ import JavaMapping.Implicits._ import akka.http.javadsl.server.RoutingJavaMapping diff --git a/docs/src/main/paradox/migration-guide/index.md b/docs/src/main/paradox/migration-guide/index.md index 4604691480c..7812d015294 100644 --- a/docs/src/main/paradox/migration-guide/index.md +++ b/docs/src/main/paradox/migration-guide/index.md @@ -4,6 +4,7 @@ @@@ index +* [migration-guide-10.7.x](migration-guide-10.7.x.md) * [migration-guide-10.6.x](migration-guide-10.6.x.md) * [migration-guide-10.4.x](migration-guide-10.4.x.md) * [migration-guide-10.2.x](migration-guide-10.2.x.md) diff --git a/docs/src/main/paradox/migration-guide/migration-guide-10.7.x.md b/docs/src/main/paradox/migration-guide/migration-guide-10.7.x.md new file mode 100644 index 00000000000..0c6945b3c41 --- /dev/null +++ b/docs/src/main/paradox/migration-guide/migration-guide-10.7.x.md @@ -0,0 +1,42 @@ +# Migration Guide to and within Akka HTTP 10.7.x + +## General Notes + +See the general @ref[compatibility guidelines](../compatibility-guidelines.md). + +Under these guidelines, minor version updates are supposed to be binary compatible and drop-in replacements +for former versions under the condition that user code only uses public, stable, non-deprecated API. + +If you find an unexpected incompatibility please let us know. + +No configuration changes are needed for updating an application from Akka HTTP 10.6.x to 10.7.x. + +## Akka repository + +The Akka dependencies are available from Akka's library repository. To access them there, you need to configure the URL for this repository. + +@@repository [sbt,Maven,Gradle] { +id="akka-repository" +name="Akka library repository" +url="https://repo.akka.io/maven" +} + +## Dependency updates + +### Akka + +Akka HTTP 10.7.x requires Akka version >= 2.10.0. + +### Jackson + +The Jackson dependency has been updated to 2.17.2 in Akka HTTP 10.7.0. That bump includes many fixes and changes to +Jackson, but it should not introduce any incompatibility in serialized format. + +### Remove dependency to scala-java8-compat + +The transitive dependency on scala-java8-compat has been removed. + +### Support for slf4j 1.7.x and logback 1.2.x removed + +This is the first release that only supports slf4j 2.0.x and logback 1.5.x. + diff --git a/docs/src/main/paradox/release-notes/10.7.x.md b/docs/src/main/paradox/release-notes/10.7.x.md new file mode 100644 index 00000000000..70a4c3df85e --- /dev/null +++ b/docs/src/main/paradox/release-notes/10.7.x.md @@ -0,0 +1,9 @@ +# 10.7.x release notes + +## 10.7.0 + +Akka HTTP 10.7.0 requires Akka 2.10.0. + +For detailed release notes on each of the 10.7 releases of Akka HTTP, see the individual GitHub release pages: https://github.com/akka/akka-http/releases + +For details about migrating between versions see @ref:[Migration Guide](../migration-guide/index.md) \ No newline at end of file diff --git a/docs/src/main/paradox/release-notes/index.md b/docs/src/main/paradox/release-notes/index.md index 499060d374f..e992be130a6 100644 --- a/docs/src/main/paradox/release-notes/index.md +++ b/docs/src/main/paradox/release-notes/index.md @@ -4,6 +4,7 @@ @@@ index +* [10.7.x](10.7.x.md) * [10.6.x](10.6.x.md) * [10.5.x](10.5.x.md) * [10.4.x](10.4.x.md) diff --git a/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala b/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala index 5712dcf37b0..c51442b971b 100644 --- a/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala +++ b/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala @@ -20,7 +20,7 @@ import scala.annotation.nowarn @nowarn("msg=deprecated") // JavaConverters deprecated class ApiMayChangeDocCheckerSpec extends AnyWordSpec with Matchers { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ def prettifyName(clazz: Class[_]): String = { clazz.getCanonicalName.replaceAll("\\$minus", "-").split("\\$")(0) diff --git a/native-image-tests/build.sbt b/native-image-tests/build.sbt index 42ed4d072d9..ffdf2f2f8d3 100644 --- a/native-image-tests/build.sbt +++ b/native-image-tests/build.sbt @@ -1,5 +1,5 @@ lazy val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.6.3") -lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.9.3") +lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.0-M1") resolvers += "Akka library repository".at("https://repo.akka.io/maven") @@ -27,7 +27,7 @@ lazy val root = (project in file(".")) "com.typesafe.akka" %% "akka-http-caching" % akkaHttpVersion, "com.typesafe.akka" %% "akka-actor-typed" % akkaVersion, "com.typesafe.akka" %% "akka-stream" % akkaVersion, - "ch.qos.logback" % "logback-classic" % "1.2.13", + "ch.qos.logback" % "logback-classic" % "1.5.7", "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % Test, "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion % Test, diff --git a/project/AkkaDependency.scala b/project/AkkaDependency.scala index 495e1a5b970..a8ad7391b91 100644 --- a/project/AkkaDependency.scala +++ b/project/AkkaDependency.scala @@ -40,7 +40,7 @@ object AkkaDependency { } // Default version updated only when needed, https://doc.akka.io/libraries/akka-core/current/project/downstream-upgrade-strategy.html - val minimumExpectedAkkaVersion = "2.9.3" + val minimumExpectedAkkaVersion = "2.10.0-M1" val default = akkaDependency(defaultVersion = minimumExpectedAkkaVersion) val docs = akkaDependency(defaultVersion = minimumExpectedAkkaVersion) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 44cafdc4245..9cee759cc95 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ import scala.language.implicitConversions object Dependencies { import DependencyHelpers._ - val jacksonDatabindVersion = "2.15.4" + val jacksonDatabindVersion = "2.17.2" val jacksonXmlVersion = jacksonDatabindVersion val junitVersion = "4.13.2" val h2specVersion = "1.5.0" diff --git a/project/MultiNode.scala b/project/MultiNode.scala index cead2e7160c..ac5e8c4dc37 100644 --- a/project/MultiNode.scala +++ b/project/MultiNode.scala @@ -32,7 +32,7 @@ object MultiNode extends AutoPlugin { override lazy val projectSettings = multiJvmSettings private val defaultMultiJvmOptions: Seq[String] = { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ // multinode.D= and multinode.X= makes it possible to pass arbitrary // -D or -X arguments to the forked jvm, e.g. // -Dmultinode.Djava.net.preferIPv4Stack=true -Dmultinode.Xmx512m -Dmultinode.XX:MaxPermSize=256M diff --git a/project/ParadoxSupport.scala b/project/ParadoxSupport.scala index 617c0469533..a9d2af34b21 100644 --- a/project/ParadoxSupport.scala +++ b/project/ParadoxSupport.scala @@ -13,8 +13,8 @@ import com.lightbend.paradox.sbt.ParadoxPlugin.autoImport._ import org.pegdown.Printer import org.pegdown.ast.{DirectiveNode, HtmlBlockNode, VerbatimNode, Visitor} -import scala.collection.JavaConverters._ import scala.io.{Codec, Source} +import scala.jdk.CollectionConverters._ object ParadoxSupport { val paradoxWithCustomDirectives = Seq( diff --git a/samples/akka-http-quickstart-java/pom.xml b/samples/akka-http-quickstart-java/pom.xml index cdb089dfd4f..b7a60336572 100644 --- a/samples/akka-http-quickstart-java/pom.xml +++ b/samples/akka-http-quickstart-java/pom.xml @@ -7,7 +7,7 @@ 1.0 - 2.9.3 + 2.10.0-M1 10.6.3 2.13 UTF-8 @@ -55,7 +55,7 @@ ch.qos.logback logback-classic - 1.2.13 + 1.5.7 com.typesafe.akka diff --git a/samples/akka-http-quickstart-scala/build.sbt b/samples/akka-http-quickstart-scala/build.sbt index 9ae635de667..07492d726c1 100644 --- a/samples/akka-http-quickstart-scala/build.sbt +++ b/samples/akka-http-quickstart-scala/build.sbt @@ -1,5 +1,5 @@ lazy val akkaHttpVersion = sys.props.getOrElse("akka-http.version", "10.6.3") -lazy val akkaVersion = "2.9.3" +lazy val akkaVersion = "2.10.0-M1" resolvers += "Akka library repository".at("https://repo.akka.io/maven")