This is an automated email from the ASF dual-hosted git repository. bonampak pushed a commit to branch feature/jakarta-jetty-upgrade in repository https://gitbox.apache.org/repos/asf/knox.git
commit cc03741b4a5c0820d68137a0a862bee9bb7c99a0 Author: bonampak <[email protected]> AuthorDate: Thu Apr 23 23:20:18 2026 +0200 KNOX-3238: rebase and migrate gateway-service-restcatalog to use jakarta.servlet API. --- gateway-service-restcatalog/pom.xml | 4 ++-- .../knox/gateway/service/restcatalog/RestCatalogDispatch.java | 6 +++--- .../gateway/service/restcatalog/RestCatalogHaDispatch.java | 6 +++--- .../service/restcatalog/TokenMetadataHeaderHandler.java | 8 ++++---- .../service/restcatalog/RestCatalogDispatchTestUtils.java | 8 ++++---- .../gateway/service/restcatalog/RestCatalogHaDispatchTest.java | 10 +++++----- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gateway-service-restcatalog/pom.xml b/gateway-service-restcatalog/pom.xml index 4f67ee25b..0a6a42a91 100644 --- a/gateway-service-restcatalog/pom.xml +++ b/gateway-service-restcatalog/pom.xml @@ -34,8 +34,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> <scope>compile</scope> </dependency> <dependency> diff --git a/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatch.java b/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatch.java index ca9951d8e..d800ac520 100644 --- a/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatch.java +++ b/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatch.java @@ -20,9 +20,9 @@ package org.apache.knox.gateway.service.restcatalog; import org.apache.http.client.methods.HttpUriRequest; import org.apache.knox.gateway.dispatch.ConfigurableDispatch; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; /** diff --git a/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatch.java b/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatch.java index eb0290a29..dc00a74f1 100644 --- a/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatch.java +++ b/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatch.java @@ -20,9 +20,9 @@ package org.apache.knox.gateway.service.restcatalog; import org.apache.http.client.methods.HttpUriRequest; import org.apache.knox.gateway.ha.dispatch.ConfigurableHADispatch; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; public class RestCatalogHaDispatch extends ConfigurableHADispatch { diff --git a/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandler.java b/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandler.java index 408b0a7ec..2588448cd 100644 --- a/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandler.java +++ b/gateway-service-restcatalog/src/main/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandler.java @@ -29,10 +29,10 @@ import org.apache.knox.gateway.services.security.token.TokenMetadata; import org.apache.knox.gateway.services.security.token.TokenStateService; import org.apache.knox.gateway.services.security.token.UnknownTokenException; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Base64; import java.util.Collections; import java.util.HashSet; diff --git a/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatchTestUtils.java b/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatchTestUtils.java index 80180ee96..2280ca85a 100644 --- a/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatchTestUtils.java +++ b/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogDispatchTestUtils.java @@ -28,10 +28,10 @@ import org.apache.knox.test.mock.MockHttpServletResponse; import org.easymock.EasyMock; import org.eclipse.jetty.http.HttpMethod; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.util.Map; import static org.easymock.EasyMock.anyString; diff --git a/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatchTest.java b/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatchTest.java index 93f69f390..3791a4414 100644 --- a/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatchTest.java +++ b/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/RestCatalogHaDispatchTest.java @@ -32,11 +32,11 @@ import org.easymock.IAnswer; import org.junit.Assert; import org.junit.Test; -import javax.servlet.FilterConfig; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URI; import java.util.ArrayList;
