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 a86145ed72af89d7a687837ab2c72f5512b67b25 Author: bonampak <[email protected]> AuthorDate: Tue Jul 21 14:05:03 2026 +0200 KNOX-3238: replace javax.servlet with jakarta.servlet in gateway-provider-security-k8s, correct incorrect rebase in HadoopGroupProviderFilterTest, replace javax.servlet with jakarta.servlet. --- .../hadoop/groups/filter/HadoopGroupProviderFilterTest.java | 2 +- .../gateway/provider/federation/OAuthFlowsFederationFilterTest.java | 2 +- gateway-provider-security-k8s/pom.xml | 4 ++-- .../apache/knox/gateway/preauth/k8s/ServiceAccountValidator.java | 6 +++--- .../knox/gateway/preauth/k8s/ServiceAccountValidatorTest.java | 4 ++-- .../gateway/service/restcatalog/TokenMetadataHeaderHandlerTest.java | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java index e3053c6b4..a473a5a87 100644 --- a/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java +++ b/gateway-provider-identity-assertion-hadoop-groups/src/test/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderFilterTest.java @@ -29,7 +29,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import jakarta.security.auth.Subject; +import javax.security.auth.Subject; import jakarta.servlet.FilterChain; import jakarta.servlet.FilterConfig; import jakarta.servlet.ServletContext; diff --git a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/OAuthFlowsFederationFilterTest.java b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/OAuthFlowsFederationFilterTest.java index b3aabe67b..23cb5db8f 100644 --- a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/OAuthFlowsFederationFilterTest.java +++ b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/OAuthFlowsFederationFilterTest.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletRequestWrapper; public class OAuthFlowsFederationFilterTest extends TokenIDAsHTTPBasicCredsFederationFilterTest { diff --git a/gateway-provider-security-k8s/pom.xml b/gateway-provider-security-k8s/pom.xml index 1f50c5f64..9bc5a407e 100644 --- a/gateway-provider-security-k8s/pom.xml +++ b/gateway-provider-security-k8s/pom.xml @@ -43,8 +43,8 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> </dependency> <dependency> diff --git a/gateway-provider-security-k8s/src/main/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidator.java b/gateway-provider-security-k8s/src/main/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidator.java index 0e353173a..43a8dc501 100644 --- a/gateway-provider-security-k8s/src/main/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidator.java +++ b/gateway-provider-security-k8s/src/main/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidator.java @@ -21,9 +21,9 @@ import org.apache.knox.gateway.i18n.messages.MessagesFactory; import org.apache.knox.gateway.preauth.filter.PreAuthValidationException; import org.apache.knox.gateway.preauth.filter.PreAuthValidator; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import java.time.Duration; import java.util.Optional; diff --git a/gateway-provider-security-k8s/src/test/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidatorTest.java b/gateway-provider-security-k8s/src/test/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidatorTest.java index d3b01195e..6efc2d05e 100644 --- a/gateway-provider-security-k8s/src/test/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidatorTest.java +++ b/gateway-provider-security-k8s/src/test/java/org/apache/knox/gateway/preauth/k8s/ServiceAccountValidatorTest.java @@ -22,8 +22,8 @@ import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; -import javax.servlet.FilterConfig; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.http.HttpServletRequest; import java.time.Duration; import java.util.Optional; diff --git a/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandlerTest.java b/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandlerTest.java index 0585a169b..3dbfb73ae 100644 --- a/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandlerTest.java +++ b/gateway-service-restcatalog/src/test/java/org/apache/knox/gateway/service/restcatalog/TokenMetadataHeaderHandlerTest.java @@ -27,9 +27,9 @@ import org.easymock.EasyMock; import org.eclipse.jetty.http.HttpMethod; import org.junit.Test; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; import java.util.Base64; import java.util.HashMap; import java.util.Map;
