From ec4da05375356654413095b714fda20224930293 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 9 Sep 2025 20:57:14 +0000 Subject: [PATCH 1/3] Update jetty-client to 12.1.1 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f73aa30e7..b7cc80c42 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -28,7 +28,7 @@ object Dependencies { val scalaLoggingVersion = "3.9.5" - val jettyVersion = "12.1.0" + val jettyVersion = "12.1.1" val typesafeConfigVersion = "1.4.4" val flexmarkVersion = "0.64.8" val logbackVersion = "1.3.15" From b742878e8be3312b544c9bb7433217b557e1055b Mon Sep 17 00:00:00 2001 From: Dawid Dworak Date: Mon, 22 Sep 2025 17:49:51 +0200 Subject: [PATCH 2/3] Switch Jetty from legacy GzipHandler to CompressionHandler --- .../main/scala/io/udash/web/server/ApplicationServer.scala | 6 +++--- project/Dependencies.scala | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/guide/backend/src/main/scala/io/udash/web/server/ApplicationServer.scala b/guide/backend/src/main/scala/io/udash/web/server/ApplicationServer.scala index 645d2e20d..db1b1f02d 100644 --- a/guide/backend/src/main/scala/io/udash/web/server/ApplicationServer.scala +++ b/guide/backend/src/main/scala/io/udash/web/server/ApplicationServer.scala @@ -10,13 +10,13 @@ import io.udash.web.guide.rest.ExposedRestInterfaces import io.udash.web.guide.rpc.ExposedRpcInterfaces import io.udash.web.guide.{GuideExceptions, MainServerRPC} import monix.execution.Scheduler +import org.eclipse.jetty.compression.server.CompressionHandler import org.eclipse.jetty.ee8.nested.SessionHandler import org.eclipse.jetty.ee8.servlet.{DefaultServlet, ServletContextHandler, ServletHolder} import org.eclipse.jetty.ee8.websocket.javax.server.config.JavaxWebSocketServletContainerInitializer import org.eclipse.jetty.rewrite.handler.{RewriteHandler, RewriteRegexRule} import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.ContextHandlerCollection -import org.eclipse.jetty.server.handler.gzip.GzipHandler import org.eclipse.jetty.util.resource.ResourceFactory import java.nio.file.Path @@ -31,7 +31,7 @@ class ApplicationServer(val port: Int, homepageResourceBase: String, guideResour server.stop() private val homepage = - new GzipHandler(createContextHandler( + new CompressionHandler(createContextHandler( hosts = Array("udash.io", "www.udash.io", "udash.local", "127.0.0.1"), resourceBase = homepageResourceBase ).get()) @@ -64,7 +64,7 @@ class ApplicationServer(val port: Int, homepageResourceBase: String, guideResour contextHandler.addServlet(new ServletHolder(RestServlet[MainServerREST](new ExposedRestInterfaces)), "/rest_api/*") - new GzipHandler(contextHandler.get()) + new CompressionHandler(contextHandler.get()) } server.setHandler( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b7cc80c42..840bf3610 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -162,6 +162,8 @@ object Dependencies { "org.eclipse.jetty" % "jetty-rewrite" % jettyVersion, "org.eclipse.jetty.ee8.websocket" % "jetty-ee8-websocket-javax-server" % jettyVersion, + "org.eclipse.jetty.compression" % "jetty-compression-server" % jettyVersion, + "org.eclipse.jetty.compression" % "jetty-compression-gzip" % jettyVersion, "com.typesafe" % "config" % typesafeConfigVersion, From 08ce7a501fb6092c97fb26af3c7eadac7ba5f10e Mon Sep 17 00:00:00 2001 From: Dawid Dworak Date: Mon, 22 Sep 2025 18:09:56 +0200 Subject: [PATCH 3/3] Remove compression in EndpointsIntegrationTest Not needed for REST testing, avoids redundant Jetty dependencies --- .../test/scala/io/udash/rest/EndpointsIntegrationTest.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rest/.jvm/src/test/scala/io/udash/rest/EndpointsIntegrationTest.scala b/rest/.jvm/src/test/scala/io/udash/rest/EndpointsIntegrationTest.scala index df4e3d5a4..20c588e2e 100644 --- a/rest/.jvm/src/test/scala/io/udash/rest/EndpointsIntegrationTest.scala +++ b/rest/.jvm/src/test/scala/io/udash/rest/EndpointsIntegrationTest.scala @@ -7,7 +7,6 @@ import monix.execution.Scheduler import org.eclipse.jetty.ee8.nested.SessionHandler import org.eclipse.jetty.ee8.servlet.{ServletContextHandler, ServletHolder} import org.eclipse.jetty.server.Server -import org.eclipse.jetty.server.handler.gzip.GzipHandler import org.scalatest.BeforeAndAfterAll import org.scalatest.concurrent.{Eventually, ScalaFutures} import org.scalatest.time.{Millis, Seconds, Span} @@ -31,7 +30,7 @@ class EndpointsIntegrationTest extends UdashSharedTest with UsesHttpServer with contextHandler.setSessionHandler(new SessionHandler) contextHandler.addServlet(holder, s"$contextPrefix/*") - server.setHandler(new GzipHandler(contextHandler.get())) + server.setHandler(contextHandler.get()) } def futureHandle(rawHandle: RawRest.HandleRequest): RestRequest => Future[RestResponse] =