(iceberg) branch main updated: Core: Upgrade Jetty and Servlet API (#10850)

[etudenhoefner]

This is an automated email from the ASF dual-hosted git repository.

etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new 122176a37f Core: Upgrade Jetty and Servlet API (#10850)
122176a37f is described below

commit 122176a37fed02f6883a75fee440fb1e7ba161ec
Author: Eduard Tudenhoefner <etudenhoef...@gmail.com>
AuthorDate: Fri Aug 2 14:08:43 2024 +0200

    Core: Upgrade Jetty and Servlet API (#10850)
    
    This is the latest Jetty version that runs with JDK11
---
 build.gradle                                                       | 1 +
 core/src/test/java/org/apache/iceberg/rest/RESTCatalogServlet.java | 6 +++---
 gradle/libs.versions.toml                                          | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 450a92f24b..36928c8695 100644
--- a/build.gradle
+++ b/build.gradle
@@ -361,6 +361,7 @@ project(':iceberg-core') {
     }
 
     testImplementation libs.jetty.servlet
+    testImplementation libs.jakarta.servlet
     testImplementation libs.jetty.server
     testImplementation libs.mockserver.netty
     testImplementation libs.mockserver.client.java
diff --git a/core/src/test/java/org/apache/iceberg/rest/RESTCatalogServlet.java 
b/core/src/test/java/org/apache/iceberg/rest/RESTCatalogServlet.java
index 954f5130ec..f456bb4d35 100644
--- a/core/src/test/java/org/apache/iceberg/rest/RESTCatalogServlet.java
+++ b/core/src/test/java/org/apache/iceberg/rest/RESTCatalogServlet.java
@@ -20,6 +20,9 @@ package org.apache.iceberg.rest;
 
 import static java.lang.String.format;
 
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -30,9 +33,6 @@ import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.iceberg.exceptions.RESTException;
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5ede5abf23..de109572de 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -57,9 +57,10 @@ jackson213 = { strictly = "2.13.4"}
 jackson214 = { strictly = "2.14.2"}
 jackson215 = { strictly = "2.15.2"}
 jakarta-el-api = "3.0.3"
+jakarta-servlet-api = "6.1.0"
 jaxb-api = "2.3.1"
 jaxb-runtime = "2.3.9"
-jetty = "9.4.55.v20240627"
+jetty = "11.0.22"
 junit = "5.10.1"
 kafka = "3.7.1"
 kryo-shaded = "4.0.3"
@@ -196,6 +197,7 @@ flink119-test-utils = { module = 
"org.apache.flink:flink-test-utils", version.re
 flink119-test-utilsjunit = { module = 
"org.apache.flink:flink-test-utils-junit", version.ref = "flink119" }
 guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = 
"guava" }
 jakarta-el-api = { module = "jakarta.el:jakarta.el-api", version.ref = 
"jakarta-el-api" }
+jakarta-servlet = {module = "jakarta.servlet:jakarta.servlet-api", version.ref 
= "jakarta-servlet-api"}
 jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = 
"jetty" }
 jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = 
"jetty" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = 
"junit" }