diff --git a/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpRequestImpl.java b/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpRequestImpl.java index e2f41b3cc..bd76262d5 100644 --- a/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpRequestImpl.java +++ b/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpRequestImpl.java @@ -20,6 +20,9 @@ import com.google.cloud.functions.HttpRequest; import io.micronaut.core.annotation.Internal; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; import java.io.BufferedReader; import java.io.IOException; @@ -36,9 +39,6 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; /** * Forked from the invoker. diff --git a/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpResponseImpl.java b/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpResponseImpl.java index 4c0047ecf..e506fa484 100644 --- a/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpResponseImpl.java +++ b/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/HttpResponseImpl.java @@ -19,6 +19,7 @@ import com.google.cloud.functions.HttpResponse; import io.micronaut.core.annotation.Internal; +import jakarta.servlet.http.HttpServletResponse; import java.io.BufferedWriter; import java.io.IOException; @@ -29,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.servlet.http.HttpServletResponse; /** * Forked from the invoker. diff --git a/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/InvokerHttpServer.java b/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/InvokerHttpServer.java index 187c4601f..5e80c42db 100644 --- a/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/InvokerHttpServer.java +++ b/gcp-function-http-test/src/main/java/io/micronaut/gcp/function/http/test/InvokerHttpServer.java @@ -27,6 +27,11 @@ import io.micronaut.http.server.exceptions.ServerStartupException; import io.micronaut.runtime.ApplicationConfiguration; import io.micronaut.runtime.server.EmbeddedServer; +import jakarta.servlet.MultipartConfigElement; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; @@ -37,11 +42,7 @@ import org.slf4j.LoggerFactory; import jakarta.inject.Singleton; -import javax.servlet.MultipartConfigElement; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; + import java.io.IOException; import java.net.*; import java.util.Arrays; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ce7809ee9..bdb7aef26 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,7 +20,7 @@ grpc = "1.54.0" kotlin = '1.8.20' cloudevents-api = "2.4.2" -jetty-servlet = "10.0.14" +jetty-servlet = "11.0.14" logback-json-classic = "0.1.5" testcontainers = "1.17.6" zipkin-sender-stackdriver = "1.0.4"