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 18add34e5e7ad5e087a0e1ee532fc2ea0cbb4193 Author: bonampak <[email protected]> AuthorDate: Sat Apr 25 19:09:32 2026 +0200 KNOX-3238: correcting dependencies and build errors (without HadoopAuthFilter) --- gateway-provider-identity-assertion-common/pom.xml | 1 + gateway-provider-rewrite-func-service-registry/pom.xml | 11 +++++------ gateway-server/pom.xml | 4 ++++ .../main/java/org/apache/knox/gateway/GatewayServer.java | 1 - .../apache/knox/gateway/filter/RequestUpdateHandler.java | 4 ---- .../java/org/apache/knox/gateway/trace/TraceResponse.java | 5 ----- gateway-service-admin/pom.xml | 8 ++++---- gateway-service-knoxtoken/pom.xml | 4 ++-- gateway-service-metadata/pom.xml | 9 ++++----- gateway-service-session/pom.xml | 9 ++++----- pom.xml | 13 ++++++++++--- 11 files changed, 34 insertions(+), 35 deletions(-) diff --git a/gateway-provider-identity-assertion-common/pom.xml b/gateway-provider-identity-assertion-common/pom.xml index 9c4b680d7..238b4d513 100644 --- a/gateway-provider-identity-assertion-common/pom.xml +++ b/gateway-provider-identity-assertion-common/pom.xml @@ -91,6 +91,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> diff --git a/gateway-provider-rewrite-func-service-registry/pom.xml b/gateway-provider-rewrite-func-service-registry/pom.xml index 6947315e8..fe2ddb89f 100644 --- a/gateway-provider-rewrite-func-service-registry/pom.xml +++ b/gateway-provider-rewrite-func-service-registry/pom.xml @@ -59,12 +59,6 @@ <artifactId>gateway-util-urltemplate</artifactId> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - </dependency> - - <!-- ********** ********** ********** ********** ********** ********** --> <!-- ********** Test Dependencies ********** --> <!-- ********** ********** ********** ********** ********** ********** --> @@ -73,6 +67,11 @@ <artifactId>httpclient</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml index c67b0ae25..20cc6eb80 100644 --- a/gateway-server/pom.xml +++ b/gateway-server/pom.xml @@ -70,6 +70,10 @@ <groupId>jakarta.json</groupId> <artifactId>jakarta.json-api</artifactId> </dependency> + <dependency> + <groupId>jakarta.websocket</groupId> + <artifactId>jakarta.websocket-client-api</artifactId> + </dependency> <dependency> <groupId>org.eclipse.parsson</groupId> <artifactId>parsson</artifactId> diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java index 5fe803141..881e42620 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java @@ -87,7 +87,6 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java index c8f5e24aa..9d95cccca 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/filter/RequestUpdateHandler.java @@ -32,10 +32,6 @@ import java.util.Locale; */ public final class RequestUpdateHandler { - private RequestUpdateHandler() { - // utility holder for the ForwardedRequest wrapper - } - /** * A request wrapper class that wraps a request and prepends a context path * to the request URI. diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java index 2cf63ae6e..bb9ed891f 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceResponse.java @@ -19,18 +19,13 @@ package org.apache.knox.gateway.trace; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import jakarta.servlet.ServletOutputStream; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.Callback; - -import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Collection; import java.util.Locale; import java.util.Set; diff --git a/gateway-service-admin/pom.xml b/gateway-service-admin/pom.xml index ecaed0cfb..4aee03b80 100644 --- a/gateway-service-admin/pom.xml +++ b/gateway-service-admin/pom.xml @@ -57,6 +57,10 @@ <groupId>org.glassfish</groupId> <artifactId>jakarta.json</artifactId> </dependency> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </dependency> <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-api</artifactId> @@ -65,10 +69,6 @@ <groupId>org.eclipse.parsson</groupId> <artifactId>parsson</artifactId> </dependency> - <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> diff --git a/gateway-service-knoxtoken/pom.xml b/gateway-service-knoxtoken/pom.xml index ec31b311f..8524e1e4c 100644 --- a/gateway-service-knoxtoken/pom.xml +++ b/gateway-service-knoxtoken/pom.xml @@ -60,8 +60,8 @@ <artifactId>jakarta.annotation-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </dependency> <dependency> <groupId>jakarta.ws.rs</groupId> diff --git a/gateway-service-metadata/pom.xml b/gateway-service-metadata/pom.xml index ded250c03..3a1b5f4f7 100644 --- a/gateway-service-metadata/pom.xml +++ b/gateway-service-metadata/pom.xml @@ -49,7 +49,10 @@ <groupId>org.apache.knox</groupId> <artifactId>gateway-util-common</artifactId> </dependency> - + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </dependency> <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> @@ -70,10 +73,6 @@ <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.moxy</artifactId> </dependency> - <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - </dependency> <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-annotations</artifactId> diff --git a/gateway-service-session/pom.xml b/gateway-service-session/pom.xml index 5e2e69b25..300429ad7 100644 --- a/gateway-service-session/pom.xml +++ b/gateway-service-session/pom.xml @@ -45,7 +45,10 @@ <groupId>org.apache.knox</groupId> <artifactId>gateway-util-common</artifactId> </dependency> - + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + </dependency> <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> @@ -66,9 +69,5 @@ <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.moxy</artifactId> </dependency> - <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index 9fa8abaa4..39662b68f 100644 --- a/pom.xml +++ b/pom.xml @@ -226,6 +226,8 @@ <jakarta.activation.version>2.0.1</jakarta.activation.version> <jakarta.activation-api.version>2.1.4</jakarta.activation-api.version> <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version> + <jakarta.el-api.version>5.0.1</jakarta.el-api.version> + <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version> <jakarta.json.version>2.0.1</jakarta.json.version> <jakarta.json-api.version>2.1.3</jakarta.json-api.version> <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version> @@ -1538,9 +1540,14 @@ </dependency> <dependency> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - <version>${javax.inject.version}</version> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> + <version>${jakarta.el-api.version}</version> + </dependency> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>${jakarta.inject-api.version}</version> </dependency> <dependency> <groupId>jakarta.servlet</groupId>
