From c0d657f195b72aeb22ea3c415de0c9798319a9e4 Mon Sep 17 00:00:00 2001 From: softwaremill-ci Date: Fri, 27 Oct 2023 11:53:26 +0200 Subject: [PATCH] Update netty-reactive-streams-http to 3.0.0 (#3262) --- build.sbt | 2 +- project/Versions.scala | 2 +- .../sttp/tapir/server/netty/internal/NettyCatsRequestBody.scala | 2 +- .../src/main/scala/sttp/tapir/server/netty/NettyConfig.scala | 2 +- .../sttp/tapir/server/netty/internal/NettyServerHandler.scala | 2 +- .../sttp/tapir/server/netty/internal/NettyZioRequestBody.scala | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sbt b/build.sbt index 9d9e38be20..4b10d70ee9 100644 --- a/build.sbt +++ b/build.sbt @@ -1434,7 +1434,7 @@ lazy val nettyServer: ProjectMatrix = (projectMatrix in file("server/netty-serve name := "tapir-netty-server", libraryDependencies ++= Seq( "io.netty" % "netty-all" % Versions.nettyAll, - "com.typesafe.netty" % "netty-reactive-streams-http" % Versions.nettyReactiveStreams + "org.playframework.netty" % "netty-reactive-streams-http" % Versions.nettyReactiveStreams ) ++ loggerDependencies, // needed because of https://github.com/coursier/coursier/issues/2016 diff --git a/project/Versions.scala b/project/Versions.scala index 4cc5e83f7f..8297b22295 100644 --- a/project/Versions.scala +++ b/project/Versions.scala @@ -21,7 +21,7 @@ object Versions { val finatra = "22.12.0" val catbird = "21.12.0" val json4s = "4.0.6" - val nettyReactiveStreams = "2.0.10" + val nettyReactiveStreams = "3.0.0" val sprayJson = "1.3.6" val scalaCheck = "1.17.0" val scalaTest = "3.2.17" diff --git a/server/netty-server/cats/src/main/scala/sttp/tapir/server/netty/internal/NettyCatsRequestBody.scala b/server/netty-server/cats/src/main/scala/sttp/tapir/server/netty/internal/NettyCatsRequestBody.scala index 6954185e09..17e2ed0a2a 100644 --- a/server/netty-server/cats/src/main/scala/sttp/tapir/server/netty/internal/NettyCatsRequestBody.scala +++ b/server/netty-server/cats/src/main/scala/sttp/tapir/server/netty/internal/NettyCatsRequestBody.scala @@ -2,7 +2,7 @@ package sttp.tapir.server.netty.internal import cats.effect.{Async, Sync} import cats.syntax.all._ -import com.typesafe.netty.http.StreamedHttpRequest +import org.playframework.netty.http.StreamedHttpRequest import fs2.Chunk import fs2.interop.reactivestreams.StreamSubscriber import fs2.io.file.{Files, Path} diff --git a/server/netty-server/src/main/scala/sttp/tapir/server/netty/NettyConfig.scala b/server/netty-server/src/main/scala/sttp/tapir/server/netty/NettyConfig.scala index 47b568442e..ee37e6c7c8 100644 --- a/server/netty-server/src/main/scala/sttp/tapir/server/netty/NettyConfig.scala +++ b/server/netty-server/src/main/scala/sttp/tapir/server/netty/NettyConfig.scala @@ -1,6 +1,6 @@ package sttp.tapir.server.netty -import com.typesafe.netty.http.HttpStreamsServerHandler +import org.playframework.netty.http.HttpStreamsServerHandler import io.netty.channel.epoll.{Epoll, EpollEventLoopGroup, EpollServerSocketChannel} import io.netty.channel.kqueue.{KQueue, KQueueEventLoopGroup, KQueueServerSocketChannel} import io.netty.channel.nio.NioEventLoopGroup diff --git a/server/netty-server/src/main/scala/sttp/tapir/server/netty/internal/NettyServerHandler.scala b/server/netty-server/src/main/scala/sttp/tapir/server/netty/internal/NettyServerHandler.scala index 166f1da01f..6a763453d2 100644 --- a/server/netty-server/src/main/scala/sttp/tapir/server/netty/internal/NettyServerHandler.scala +++ b/server/netty-server/src/main/scala/sttp/tapir/server/netty/internal/NettyServerHandler.scala @@ -1,6 +1,6 @@ package sttp.tapir.server.netty.internal -import com.typesafe.netty.http.{DefaultStreamedHttpResponse, StreamedHttpRequest} +import org.playframework.netty.http.{DefaultStreamedHttpResponse, StreamedHttpRequest} import com.typesafe.scalalogging.Logger import io.netty.buffer.{ByteBuf, Unpooled} import io.netty.channel._ diff --git a/server/netty-server/zio/src/main/scala/sttp/tapir/server/netty/internal/NettyZioRequestBody.scala b/server/netty-server/zio/src/main/scala/sttp/tapir/server/netty/internal/NettyZioRequestBody.scala index b37579ef86..eff6650e08 100644 --- a/server/netty-server/zio/src/main/scala/sttp/tapir/server/netty/internal/NettyZioRequestBody.scala +++ b/server/netty-server/zio/src/main/scala/sttp/tapir/server/netty/internal/NettyZioRequestBody.scala @@ -1,6 +1,6 @@ package sttp.tapir.server.netty.internal -import com.typesafe.netty.http.StreamedHttpRequest +import org.playframework.netty.http.StreamedHttpRequest import io.netty.buffer.ByteBufUtil import io.netty.handler.codec.http.FullHttpRequest import sttp.capabilities.zio.ZioStreams