diff --git a/core/maven-example/pom.xml b/core/maven-example/pom.xml index 821fa6f04..5ec21b986 100644 --- a/core/maven-example/pom.xml +++ b/core/maven-example/pom.xml @@ -25,18 +25,18 @@ jakarta.servlet.jsp.jstl jakarta.servlet.jsp.jstl-api - 2.0.0 + 3.0.0 jakarta.servlet jakarta.servlet-api - 5.0.0 + 6.0.0 provided jakarta.servlet.jsp jakarta.servlet.jsp-api - 3.0.0 + 3.1.1 provided diff --git a/core/pom.xml b/core/pom.xml index ba83ac6d3..254ec6ac5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -113,7 +113,7 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 + 6.0.0 provided @@ -145,13 +145,13 @@ test - org.eclipse.jetty.ee9 - jetty-ee9-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty.ee10 + jetty-ee10-webapp test diff --git a/core/src/main/java/io/jenkins/servlet/ServletContextWrapper.java b/core/src/main/java/io/jenkins/servlet/ServletContextWrapper.java index 055a7f342..c6dfb905d 100644 --- a/core/src/main/java/io/jenkins/servlet/ServletContextWrapper.java +++ b/core/src/main/java/io/jenkins/servlet/ServletContextWrapper.java @@ -4,7 +4,6 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import java.util.Collections; import java.util.Enumeration; import java.util.EventListener; import java.util.Map; @@ -93,37 +92,11 @@ public jakarta.servlet.RequestDispatcher getNamedDispatcher(String path) { : null; } - @Override - public jakarta.servlet.Servlet getServlet(String name) throws jakarta.servlet.ServletException { - try { - return ServletWrapper.toJakartaServlet(from.getServlet(name)); - } catch (ServletException e) { - throw ServletExceptionWrapper.toJakartaServletException(e); - } - } - - @Override - public Enumeration getServlets() { - return Collections.enumeration(Collections.list(from.getServlets()).stream() - .map(ServletWrapper::toJakartaServlet) - .collect(Collectors.toList())); - } - - @Override - public Enumeration getServletNames() { - return from.getServletNames(); - } - @Override public void log(String msg) { from.log(msg); } - @Override - public void log(Exception exception, String msg) { - from.log(exception, msg); - } - @Override public void log(String message, Throwable throwable) { from.log(message, throwable); @@ -440,24 +413,21 @@ public RequestDispatcher getNamedDispatcher(String name) { } @Override - public Servlet getServlet(String name) throws ServletException { - try { - return ServletWrapper.fromJakartaServlet(from.getServlet(name)); - } catch (jakarta.servlet.ServletException e) { - throw ServletExceptionWrapper.fromJakartaServletException(e); - } + public Servlet getServlet(String name) { + // TODO implement this + throw new UnsupportedOperationException(); } @Override public Enumeration getServlets() { - return Collections.enumeration(Collections.list(from.getServlets()).stream() - .map(ServletWrapper::fromJakartaServlet) - .collect(Collectors.toList())); + // TODO implement this + throw new UnsupportedOperationException(); } @Override public Enumeration getServletNames() { - return from.getServletNames(); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -467,7 +437,8 @@ public void log(String msg) { @Override public void log(Exception exception, String msg) { - from.log(exception, msg); + // TODO implement this + throw new UnsupportedOperationException(); } @Override diff --git a/core/src/main/java/io/jenkins/servlet/ServletRequestWrapper.java b/core/src/main/java/io/jenkins/servlet/ServletRequestWrapper.java index afb4c68ca..22b6836c1 100644 --- a/core/src/main/java/io/jenkins/servlet/ServletRequestWrapper.java +++ b/core/src/main/java/io/jenkins/servlet/ServletRequestWrapper.java @@ -1,5 +1,6 @@ package io.jenkins.servlet; +import jakarta.servlet.ServletConnection; import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -170,11 +171,6 @@ public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) { : null; } - @Override - public String getRealPath(String path) { - return from.getRealPath(path); - } - @Override public int getRemotePort() { return from.getRemotePort(); @@ -233,6 +229,24 @@ public jakarta.servlet.DispatcherType getDispatcherType() { return DispatcherTypeWrapper.toJakartaDispatcherType(from.getDispatcherType()); } + @Override + public String getRequestId() { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public String getProtocolRequestId() { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public ServletConnection getServletConnection() { + // TODO implement this + throw new UnsupportedOperationException(); + } + @Override public ServletRequest toJavaxServletRequest() { return from; @@ -380,7 +394,8 @@ public RequestDispatcher getRequestDispatcher(String path) { @Override public String getRealPath(String path) { - return from.getRealPath(path); + // TODO implement this + throw new UnsupportedOperationException(); } @Override diff --git a/core/src/main/java/io/jenkins/servlet/SessionCookieConfigWrapper.java b/core/src/main/java/io/jenkins/servlet/SessionCookieConfigWrapper.java index b6e095062..b313c315a 100644 --- a/core/src/main/java/io/jenkins/servlet/SessionCookieConfigWrapper.java +++ b/core/src/main/java/io/jenkins/servlet/SessionCookieConfigWrapper.java @@ -1,5 +1,6 @@ package io.jenkins.servlet; +import java.util.Map; import java.util.Objects; import javax.servlet.SessionCookieConfig; @@ -76,6 +77,24 @@ public void setMaxAge(int maxAge) { public int getMaxAge() { return from.getMaxAge(); } + + @Override + public void setAttribute(String name, String value) { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public String getAttribute(String name) { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public Map getAttributes() { + // TODO implement this + throw new UnsupportedOperationException(); + } }; } diff --git a/core/src/main/java/io/jenkins/servlet/descriptor/JspPropertyGroupDescriptorWrapper.java b/core/src/main/java/io/jenkins/servlet/descriptor/JspPropertyGroupDescriptorWrapper.java index 450420958..6c53020f8 100644 --- a/core/src/main/java/io/jenkins/servlet/descriptor/JspPropertyGroupDescriptorWrapper.java +++ b/core/src/main/java/io/jenkins/servlet/descriptor/JspPropertyGroupDescriptorWrapper.java @@ -19,6 +19,12 @@ public String getElIgnored() { return from.getElIgnored(); } + @Override + public String getErrorOnELNotFound() { + // TODO implement this + throw new UnsupportedOperationException(); + } + @Override public String getPageEncoding() { return from.getPageEncoding(); diff --git a/core/src/main/java/io/jenkins/servlet/http/HttpServletRequestWrapper.java b/core/src/main/java/io/jenkins/servlet/http/HttpServletRequestWrapper.java index b64239340..5e835f778 100644 --- a/core/src/main/java/io/jenkins/servlet/http/HttpServletRequestWrapper.java +++ b/core/src/main/java/io/jenkins/servlet/http/HttpServletRequestWrapper.java @@ -8,6 +8,7 @@ import io.jenkins.servlet.ServletInputStreamWrapper; import io.jenkins.servlet.ServletRequestWrapper; import io.jenkins.servlet.ServletResponseWrapper; +import jakarta.servlet.ServletConnection; import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -193,11 +194,6 @@ public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) { : null; } - @Override - public String getRealPath(String path) { - return from.getRealPath(path); - } - @Override public int getRemotePort() { return from.getRemotePort(); @@ -256,6 +252,24 @@ public jakarta.servlet.DispatcherType getDispatcherType() { return DispatcherTypeWrapper.toJakartaDispatcherType(from.getDispatcherType()); } + @Override + public String getRequestId() { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public String getProtocolRequestId() { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public ServletConnection getServletConnection() { + // TODO implement this + throw new UnsupportedOperationException(); + } + @Override public String getAuthType() { return from.getAuthType(); @@ -400,11 +414,6 @@ public boolean isRequestedSessionIdFromURL() { return from.isRequestedSessionIdFromURL(); } - @Override - public boolean isRequestedSessionIdFromUrl() { - return from.isRequestedSessionIdFromUrl(); - } - @Override public boolean authenticate(jakarta.servlet.http.HttpServletResponse response) throws IOException, jakarta.servlet.ServletException { @@ -617,7 +626,8 @@ public RequestDispatcher getRequestDispatcher(String path) { @Override public String getRealPath(String path) { - return from.getRealPath(path); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -823,7 +833,8 @@ public boolean isRequestedSessionIdFromURL() { @Override public boolean isRequestedSessionIdFromUrl() { - return from.isRequestedSessionIdFromUrl(); + // TODO implement this + throw new UnsupportedOperationException(); } @Override diff --git a/core/src/main/java/io/jenkins/servlet/http/HttpServletResponseWrapper.java b/core/src/main/java/io/jenkins/servlet/http/HttpServletResponseWrapper.java index e2a0d0da3..6b65ce2d9 100644 --- a/core/src/main/java/io/jenkins/servlet/http/HttpServletResponseWrapper.java +++ b/core/src/main/java/io/jenkins/servlet/http/HttpServletResponseWrapper.java @@ -147,16 +147,6 @@ public String encodeRedirectURL(String url) { return from.encodeRedirectURL(url); } - @Override - public String encodeUrl(String url) { - return from.encodeUrl(url); - } - - @Override - public String encodeRedirectUrl(String url) { - return from.encodeRedirectUrl(url); - } - @Override public void sendError(int sc, String msg) throws IOException { from.sendError(sc, msg); @@ -207,11 +197,6 @@ public void setStatus(int sc) { from.setStatus(sc); } - @Override - public void setStatus(int sc, String sm) { - from.setStatus(sc, sm); - } - @Override public int getStatus() { return from.getStatus(); @@ -369,12 +354,14 @@ public String encodeRedirectURL(String url) { @Override public String encodeUrl(String url) { - return from.encodeUrl(url); + // TODO implement this + throw new UnsupportedOperationException(); } @Override public String encodeRedirectUrl(String url) { - return from.encodeRedirectUrl(url); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -429,7 +416,8 @@ public void setStatus(int sc) { @Override public void setStatus(int sc, String sm) { - from.setStatus(sc, sm); + // TODO implement this + throw new UnsupportedOperationException(); } @Override diff --git a/core/src/main/java/io/jenkins/servlet/http/HttpSessionContextWrapper.java b/core/src/main/java/io/jenkins/servlet/http/HttpSessionContextWrapper.java deleted file mode 100644 index 1edfe3e03..000000000 --- a/core/src/main/java/io/jenkins/servlet/http/HttpSessionContextWrapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.jenkins.servlet.http; - -import java.util.Enumeration; -import java.util.Objects; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; - -public class HttpSessionContextWrapper { - public static jakarta.servlet.http.HttpSessionContext toJakartaHttpSessionContext(HttpSessionContext from) { - Objects.requireNonNull(from); - return new jakarta.servlet.http.HttpSessionContext() { - @Override - public jakarta.servlet.http.HttpSession getSession(String sessionId) { - return HttpSessionWrapper.toJakartaHttpSession(from.getSession(sessionId)); - } - - @Override - public Enumeration getIds() { - return from.getIds(); - } - }; - } - - public static HttpSessionContext fromJakartaHttpSessionContext(jakarta.servlet.http.HttpSessionContext from) { - Objects.requireNonNull(from); - return new HttpSessionContext() { - @Override - public HttpSession getSession(String sessionId) { - return HttpSessionWrapper.fromJakartaHttpSession(from.getSession(sessionId)); - } - - @Override - public Enumeration getIds() { - return from.getIds(); - } - }; - } -} diff --git a/core/src/main/java/io/jenkins/servlet/http/HttpSessionWrapper.java b/core/src/main/java/io/jenkins/servlet/http/HttpSessionWrapper.java index 301b5a127..d38c21bc9 100644 --- a/core/src/main/java/io/jenkins/servlet/http/HttpSessionWrapper.java +++ b/core/src/main/java/io/jenkins/servlet/http/HttpSessionWrapper.java @@ -41,51 +41,26 @@ public int getMaxInactiveInterval() { return from.getMaxInactiveInterval(); } - @Override - public jakarta.servlet.http.HttpSessionContext getSessionContext() { - return HttpSessionContextWrapper.toJakartaHttpSessionContext(from.getSessionContext()); - } - @Override public Object getAttribute(String name) { return from.getAttribute(name); } - @Override - public Object getValue(String name) { - return from.getValue(name); - } - @Override public Enumeration getAttributeNames() { return from.getAttributeNames(); } - @Override - public String[] getValueNames() { - return from.getValueNames(); - } - @Override public void setAttribute(String name, Object value) { from.setAttribute(name, value); } - @Override - public void putValue(String name, Object value) { - from.putValue(name, value); - } - @Override public void removeAttribute(String name) { from.removeAttribute(name); } - @Override - public void removeValue(String name) { - from.removeValue(name); - } - @Override public void invalidate() { from.invalidate(); @@ -133,7 +108,8 @@ public int getMaxInactiveInterval() { @Override public HttpSessionContext getSessionContext() { - return HttpSessionContextWrapper.fromJakartaHttpSessionContext(from.getSessionContext()); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -143,7 +119,8 @@ public Object getAttribute(String name) { @Override public Object getValue(String name) { - return from.getValue(name); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -153,7 +130,8 @@ public Enumeration getAttributeNames() { @Override public String[] getValueNames() { - return from.getValueNames(); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -163,7 +141,8 @@ public void setAttribute(String name, Object value) { @Override public void putValue(String name, Object value) { - from.putValue(name, value); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -173,7 +152,8 @@ public void removeAttribute(String name) { @Override public void removeValue(String name) { - from.removeValue(name); + // TODO implement this + throw new UnsupportedOperationException(); } @Override diff --git a/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java b/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java index 1ac68ece1..86eafb8ae 100644 --- a/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java +++ b/core/src/main/java/org/kohsuke/stapler/ResponseImpl.java @@ -383,7 +383,7 @@ public int reverseProxyTo(URL url, StaplerRequest2 req) throws IOException { // copy the response int code = con.getResponseCode(); - setStatus(con, code); + setStatus(code); Map> rspHeaders = con.getHeaderFields(); for (Entry> header : rspHeaders.entrySet()) { if (header.getKey() == null) { @@ -404,12 +404,6 @@ private static HttpURLConnection openConnection(URL url) throws IOException { return (HttpURLConnection) url.openConnection(); } - @SuppressFBWarnings(value = "XSS_SERVLET", justification = "Not relevant in this situation.") - private void setStatus(HttpURLConnection con, int code) throws IOException { - // Should also fix the deprecation. - setStatus(code, con.getResponseMessage()); - } - @Override public void setJsonConfig(JsonConfig config) { jsonConfig = config; diff --git a/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java b/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java index 0c0ea358b..1b81c2b5a 100644 --- a/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java +++ b/core/src/main/java/org/kohsuke/stapler/StaplerRequest.java @@ -37,6 +37,7 @@ import io.jenkins.servlet.http.HttpServletResponseWrapper; import io.jenkins.servlet.http.HttpSessionWrapper; import io.jenkins.servlet.http.PartWrapper; +import jakarta.servlet.ServletConnection; import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -749,11 +750,6 @@ public jakarta.servlet.RequestDispatcher getRequestDispatcher(String path) { : null; } - @Override - public String getRealPath(String path) { - return from.getRealPath(path); - } - @Override public int getRemotePort() { return from.getRemotePort(); @@ -1034,6 +1030,24 @@ public jakarta.servlet.DispatcherType getDispatcherType() { return DispatcherTypeWrapper.toJakartaDispatcherType(from.getDispatcherType()); } + @Override + public String getRequestId() { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public String getProtocolRequestId() { + // TODO implement this + throw new UnsupportedOperationException(); + } + + @Override + public ServletConnection getServletConnection() { + // TODO implement this + throw new UnsupportedOperationException(); + } + @Override public String getAuthType() { return from.getAuthType(); @@ -1178,11 +1192,6 @@ public boolean isRequestedSessionIdFromURL() { return from.isRequestedSessionIdFromURL(); } - @Override - public boolean isRequestedSessionIdFromUrl() { - return from.isRequestedSessionIdFromUrl(); - } - @Override public boolean authenticate(jakarta.servlet.http.HttpServletResponse response) throws IOException, jakarta.servlet.ServletException { @@ -1408,7 +1417,8 @@ public RequestDispatcher getRequestDispatcher(String path) { @Override public String getRealPath(String path) { - return from.getRealPath(path); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -1835,7 +1845,8 @@ public boolean isRequestedSessionIdFromURL() { @Override public boolean isRequestedSessionIdFromUrl() { - return from.isRequestedSessionIdFromUrl(); + // TODO implement this + throw new UnsupportedOperationException(); } @Override diff --git a/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java b/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java index 37939e6d1..7932073e4 100644 --- a/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java +++ b/core/src/main/java/org/kohsuke/stapler/StaplerResponse.java @@ -228,7 +228,7 @@ void serveFile(StaplerRequest req, InputStream data, long lastModified, int cont * *

As of 1.146, the {@code tree} parameter may be used to control the output * in detail; see {@link NamedPathPruner#NamedPathPruner(String)} for details. - * + * ' * *

{@link ExportConfig} is passed by the caller to control serialization behavior * @since 1.251 */ @@ -582,16 +582,6 @@ public String encodeRedirectURL(String url) { return from.encodeRedirectURL(url); } - @Override - public String encodeUrl(String url) { - return from.encodeUrl(url); - } - - @Override - public String encodeRedirectUrl(String url) { - return from.encodeRedirectUrl(url); - } - @Override public void sendError(int sc, String msg) throws IOException { from.sendError(sc, msg); @@ -642,11 +632,6 @@ public void setStatus(int sc) { from.setStatus(sc); } - @Override - public void setStatus(int sc, String sm) { - from.setStatus(sc, sm); - } - @Override public int getStatus() { return from.getStatus(); @@ -976,12 +961,14 @@ public String encodeRedirectURL(String url) { @Override public String encodeUrl(String url) { - return from.encodeUrl(url); + // TODO implement this + throw new UnsupportedOperationException(); } @Override public String encodeRedirectUrl(String url) { - return from.encodeRedirectUrl(url); + // TODO implement this + throw new UnsupportedOperationException(); } @Override @@ -1036,7 +1023,8 @@ public void setStatus(int sc) { @Override public void setStatus(int sc, String sm) { - from.setStatus(sc, sm); + // TODO implement this + throw new UnsupportedOperationException(); } @Override diff --git a/core/src/main/java/org/kohsuke/stapler/StaplerResponse2Wrapper.java b/core/src/main/java/org/kohsuke/stapler/StaplerResponse2Wrapper.java index de2fa1ae9..ba8328b8a 100644 --- a/core/src/main/java/org/kohsuke/stapler/StaplerResponse2Wrapper.java +++ b/core/src/main/java/org/kohsuke/stapler/StaplerResponse2Wrapper.java @@ -227,24 +227,12 @@ public String encodeRedirectURL(String url) { return getWrapped().encodeRedirectURL(url); } - /** {@inheritDoc} */ - @Override - public String encodeRedirectUrl(String url) { - return getWrapped().encodeRedirectUrl(url); - } - /** {@inheritDoc} */ @Override public String encodeURL(String url) { return getWrapped().encodeURL(url); } - /** {@inheritDoc} */ - @Override - public String encodeUrl(String url) { - return getWrapped().encodeUrl(url); - } - /** {@inheritDoc} */ @Override public void sendError(int sc) throws IOException { @@ -281,12 +269,6 @@ public void setStatus(int sc) { getWrapped().setStatus(sc); } - /** {@inheritDoc} */ - @Override - public void setStatus(int sc, String sm) { - getWrapped().setStatus(sc, sm); - } - /** {@inheritDoc} */ @Override public void flushBuffer() throws IOException { diff --git a/core/src/test/java/org/kohsuke/stapler/MockRequest.java b/core/src/test/java/org/kohsuke/stapler/MockRequest.java index f1bbc8c2d..fefac46af 100644 --- a/core/src/test/java/org/kohsuke/stapler/MockRequest.java +++ b/core/src/test/java/org/kohsuke/stapler/MockRequest.java @@ -3,6 +3,7 @@ import jakarta.servlet.AsyncContext; import jakarta.servlet.DispatcherType; import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletException; import jakarta.servlet.ServletInputStream; @@ -171,12 +172,6 @@ public boolean isRequestedSessionIdFromURL() { throw new UnsupportedOperationException(); } - @Override - public boolean isRequestedSessionIdFromUrl() { - // TODO - throw new UnsupportedOperationException(); - } - @Override public Object getAttribute(String name) { // TODO @@ -324,12 +319,6 @@ public RequestDispatcher getRequestDispatcher(String path) { throw new UnsupportedOperationException(); } - @Override - public String getRealPath(String path) { - // TODO - throw new UnsupportedOperationException(); - } - @Override public long getContentLengthLong() { // TODO @@ -403,6 +392,24 @@ public DispatcherType getDispatcherType() { throw new UnsupportedOperationException(); } + @Override + public String getRequestId() { + // TODO + throw new UnsupportedOperationException(); + } + + @Override + public String getProtocolRequestId() { + // TODO + throw new UnsupportedOperationException(); + } + + @Override + public ServletConnection getServletConnection() { + // TODO + throw new UnsupportedOperationException(); + } + @Override public String changeSessionId() { // TODO diff --git a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java index ceff626fd..ee582277a 100644 --- a/core/src/test/java/org/kohsuke/stapler/MockServletContext.java +++ b/core/src/test/java/org/kohsuke/stapler/MockServletContext.java @@ -69,27 +69,9 @@ public RequestDispatcher getNamedDispatcher(String name) { return null; } - @Override - public Servlet getServlet(String name) throws ServletException { - return null; - } - - @Override - public Enumeration getServlets() { - return null; - } - - @Override - public Enumeration getServletNames() { - return null; - } - @Override public void log(String msg) {} - @Override - public void log(Exception exception, String msg) {} - @Override public void log(String message, Throwable throwable) {} diff --git a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java index 9b32c3b6c..1200b58c2 100644 --- a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java +++ b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java @@ -7,9 +7,9 @@ import java.net.URL; import java.nio.charset.Charset; import junit.framework.TestCase; -import org.eclipse.jetty.ee9.servlet.ServletContextHandler; -import org.eclipse.jetty.ee9.servlet.ServletHolder; -import org.eclipse.jetty.ee9.webapp.WebAppContext; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; +import org.eclipse.jetty.ee10.webapp.WebAppContext; import org.eclipse.jetty.http.UriCompliance; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.HttpConnectionFactory; @@ -47,7 +47,7 @@ protected void setUp() throws Exception { server.setHandler(new WebAppContext("/noroot", "")); final ServletContextHandler context = - new ServletContextHandler(server, getContextPath(), ServletContextHandler.SESSIONS); + new ServletContextHandler(getContextPath(), ServletContextHandler.SESSIONS); configure(context); server.setHandler(context); diff --git a/groovy/pom.xml b/groovy/pom.xml index 521dafffa..ec9fc4e3b 100644 --- a/groovy/pom.xml +++ b/groovy/pom.xml @@ -30,7 +30,7 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 + 6.0.0 provided diff --git a/jelly/pom.xml b/jelly/pom.xml index 88ab4d9c8..bc4fdad5e 100644 --- a/jelly/pom.xml +++ b/jelly/pom.xml @@ -12,7 +12,8 @@ Jelly binding for Stapler - 1.1-jenkins-20250107 + + 1.1-jenkins-20250108-rc228.71544910919d 195.v4662dd79fdb_d @@ -48,7 +49,7 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 + 6.0.0 provided @@ -71,13 +72,13 @@ test - org.eclipse.jetty.ee9 - jetty-ee9-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet test - org.eclipse.jetty.ee9 - jetty-ee9-webapp + org.eclipse.jetty.ee10 + jetty-ee10-webapp test diff --git a/jsp/pom.xml b/jsp/pom.xml index f98be563a..625ede0f6 100644 --- a/jsp/pom.xml +++ b/jsp/pom.xml @@ -25,13 +25,13 @@ jakarta.servlet jakarta.servlet-api - 5.0.0 + 6.0.0 provided jakarta.servlet.jsp jakarta.servlet.jsp-api - 3.0.0 + 3.1.1 provided diff --git a/pom.xml b/pom.xml index 7b6097dc5..374b89d17 100644 --- a/pom.xml +++ b/pom.xml @@ -56,8 +56,8 @@ import - org.eclipse.jetty.ee9 - jetty-ee9-bom + org.eclipse.jetty.ee10 + jetty-ee10-bom ${jetty.version} pom import