This is an automated email from the ASF dual-hosted git repository.
namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new d1d29d9cd6e IGNITE-24139 Updated jetty-server dependency version from
9.4.56.v20240826 to 11.0.24 (#11830)
d1d29d9cd6e is described below
commit d1d29d9cd6ec53bbb267cab76af2f28698936dd2
Author: Julia Bakulina <[email protected]>
AuthorDate: Thu Feb 6 18:04:38 2025 +0300
IGNITE-24139 Updated jetty-server dependency version from 9.4.56.v20240826
to 11.0.24 (#11830)
---
modules/rest-http/pom.xml | 12 +++---------
.../protocols/http/jetty/GridJettyRestHandler.java | 10 +++++-----
.../protocols/http/jetty/GridJettyRestProtocol.java | 5 ++++-
.../org/apache/ignite/webtest/TestJtaTxServlet.java | 8 ++++----
modules/web/pom.xml | 6 ++++++
.../apache/ignite/cache/websession/WebSession.java | 6 +++---
.../ignite/cache/websession/WebSessionFilter.java | 20 ++++++++++----------
.../apache/ignite/cache/websession/WebSessionV2.java | 6 +++---
.../servlet/ServletContextListenerStartup.java | 6 +++---
.../ignite/startup/servlet/ServletStartup.java | 4 ++--
.../internal/websession/WebSessionSelfTest.java | 10 +++++-----
.../internal/websession/WebSessionServerStart.java | 10 +++++-----
parent/pom.xml | 3 ++-
13 files changed, 55 insertions(+), 51 deletions(-)
diff --git a/modules/rest-http/pom.xml b/modules/rest-http/pom.xml
index 2eb640b145b..a84766d463e 100644
--- a/modules/rest-http/pom.xml
+++ b/modules/rest-http/pom.xml
@@ -58,12 +58,6 @@
<version>${commons.lang.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-continuation</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
@@ -95,9 +89,9 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-jakarta-servlet-api</artifactId>
+ <version>${jetty-jakarta-servlet-api.version}</version>
</dependency>
<dependency>
diff --git
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index e9550d7a358..efb4aff121c 100644
---
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -37,13 +37,13 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.InjectableValues;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.IgniteSystemProperties;
@@ -931,7 +931,7 @@ public class GridJettyRestHandler extends AbstractHandler {
restReq.command(cmd);
- Object certs =
req.getAttribute("javax.servlet.request.X509Certificate");
+ Object certs =
req.getAttribute("jakarta.servlet.request.X509Certificate");
if (certs instanceof X509Certificate[])
restReq.certificates((X509Certificate[])certs);
diff --git
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
index 0220395a55e..d29d38fb6e6 100644
---
a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
+++
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java
@@ -43,6 +43,7 @@ import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.MultiException;
+import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.xml.XmlConfiguration;
import org.jetbrains.annotations.Nullable;
@@ -275,7 +276,9 @@ public class GridJettyRestProtocol extends
GridRestProtocolAdapter {
XmlConfiguration cfg;
try {
- cfg = new XmlConfiguration(cfgUrl);
+ Resource rsrc = Resource.newResource(cfgUrl);
+
+ cfg = new XmlConfiguration(rsrc);
}
catch (FileNotFoundException e) {
throw new IgniteSpiException("Failed to find configuration
file: " + cfgUrl, e);
diff --git
a/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java
b/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java
index 2b3b87f823a..e7f33aa3fc3 100644
---
a/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java
+++
b/modules/web/ignite-websphere-test/src/main/java/org/apache/ignite/webtest/TestJtaTxServlet.java
@@ -19,13 +19,13 @@ package org.apache.ignite.webtest;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.transaction.RollbackException;
import javax.transaction.TransactionManager;
import com.ibm.tx.jta.TransactionManagerFactory;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
diff --git a/modules/web/pom.xml b/modules/web/pom.xml
index a743f5423c9..f5e12069f83 100644
--- a/modules/web/pom.xml
+++ b/modules/web/pom.xml
@@ -46,6 +46,12 @@
<version>${tomcat.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.toolchain</groupId>
+ <artifactId>jetty-jakarta-servlet-api</artifactId>
+ <version>${jetty-jakarta-servlet-api.version}</version>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ignite-spring</artifactId>
diff --git
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java
index 2010f917312..1e211391676 100644
---
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java
+++
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSession.java
@@ -27,9 +27,9 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionContext;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.T2;
diff --git
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
index f0a31ed81fc..f27516ce5e0 100644
---
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
+++
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionFilter.java
@@ -24,16 +24,16 @@ import javax.cache.CacheException;
import javax.cache.expiry.Duration;
import javax.cache.expiry.ExpiryPolicy;
import javax.cache.expiry.ModifiedExpiryPolicy;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpSession;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteClientDisconnectedException;
diff --git
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
index 23185697224..089f2e5d808 100644
---
a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
+++
b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionV2.java
@@ -24,9 +24,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionContext;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
diff --git
a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
index 8f34ff46ba7..b953a50ff41 100644
---
a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
+++
b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletContextListenerStartup.java
@@ -22,9 +22,9 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
diff --git
a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
index 487215a32f6..9b21e54462c 100644
---
a/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
+++
b/modules/web/src/main/java/org/apache/ignite/startup/servlet/ServletStartup.java
@@ -20,8 +20,8 @@ package org.apache.ignite.startup.servlet;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.configuration.IgniteConfiguration;
diff --git
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 0e4c1d48c66..51563993b4f 100644
---
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -40,11 +40,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicReferenceArray;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
diff --git
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java
index ac9f6cb47d6..b620085e09e 100644
---
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java
+++
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionServerStart.java
@@ -18,11 +18,11 @@
package org.apache.ignite.internal.websession;
import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.eclipse.jetty.server.Server;
diff --git a/parent/pom.xml b/parent/pom.xml
index e720dcbf8b9..a53ecda0b09 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,7 +84,8 @@
<javax.cache.version>1.0.0</javax.cache.version>
<jboss.rmi.version>1.0.6.Final</jboss.rmi.version>
<jetbrains.annotations.version>16.0.3</jetbrains.annotations.version>
- <jetty.version>9.4.56.v20240826</jetty.version>
+ <jetty.version>11.0.24</jetty.version>
+
<jetty-jakarta-servlet-api.version>5.0.2</jetty-jakarta-servlet-api.version>
<jmh.version>1.13</jmh.version>
<jna.version>4.5.2</jna.version>
<jnr.posix.version>3.1.15</jnr.posix.version>
