Skip to content

Switch to Jetty 12 for JDK17+ using profiles #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coheigea merged 1 commit into from
Aug 4, 2026
+98 −27
Merged

Switch to Jetty 12 for JDK17+ using profiles #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 54 additions & 19 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@
<commons.codec.version>1.22.1</commons.codec.version>
<hamcrest.version>3.0</hamcrest.version>
<jaxb.runtime>4.0.9</jaxb.runtime>
<jetty.version>11.0.24</jetty.version>
<jetty11.version>11.0.24</jetty11.version>
<jetty12.version>12.0.18</jetty12.version>
<jmh.version>1.37</jmh.version>
<junit.version>5.14.4</junit.version>
<slf4j.version>2.0.18</slf4j.version>
Expand Down Expand Up @@ -195,24 +196,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
Expand Down Expand Up @@ -764,5 +747,57 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>jetty11-jdk11</id>
<activation>
<jdk>[11,17)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty11.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty11.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>${jetty11.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>jetty12-jdk17-plus</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<dependencies>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty12.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty12.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlets</artifactId>
<version>${jetty12.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
52 changes: 44 additions & 8 deletions src/test/java/org/apache/xml/security/test/stax/utils/HttpRequestRedirectorProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import java.io.InputStream;
import java.lang.System.Logger;
import java.lang.System.Logger.Level;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Proxy;
Expand All @@ -37,8 +40,6 @@
import org.apache.xml.security.stax.ext.XMLSecurityUtils;
import org.eclipse.jetty.http.MimeTypes;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;

/**
*/
Expand All @@ -47,6 +48,7 @@ public class HttpRequestRedirectorProxy {

private static final int startPort = 31280;
private static Server httpServer;
private static final String JETTY_SERVLET_PACKAGE = resolveJettyServletPackage();

public static Proxy startHttpEngine() throws Exception {

Expand All @@ -68,17 +70,17 @@ public static Proxy startHttpEngine() throws Exception {
resourceHandler.setResourceBase(".");
httpServer.setHandler(resourceHandler);*/

ServletContextHandler context = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
context.setContextPath("/");
httpServer.setHandler(context);
context.addServlet(new ServletHolder(new TestingHttpProxyServlet()), "/*");
httpServer.start();
Object context = newJettyServletContextHandler();
invoke(context, "setContextPath", new Class<?>[] {String.class}, "/");
invoke(httpServer, "setHandler", new Class<?>[] {Class.forName("org.eclipse.jetty.server.Handler")}, context);
addServlet(context, new TestingHttpProxyServlet(), "/*");
invoke(httpServer, "start");

return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(InetAddress.getByName("127.0.0.1"), port));
}

public static void stopHttpEngine() throws Exception {
httpServer.stop();
invoke(httpServer, "stop");
}

static class TestingHttpProxyServlet extends HttpServlet {
Expand Down Expand Up @@ -116,4 +118,38 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
resp.sendError(HttpServletResponse.SC_NOT_FOUND);
}
}

private static String resolveJettyServletPackage() {
try {
Class.forName("org.eclipse.jetty.ee10.servlet.ServletContextHandler");
return "org.eclipse.jetty.ee10.servlet";
} catch (ClassNotFoundException ex) {
return "org.eclipse.jetty.servlet";
}
}

private static Object newJettyServletContextHandler() throws Exception {
Class<?> contextClass = Class.forName(JETTY_SERVLET_PACKAGE + ".ServletContextHandler");
Field noSessionsField = contextClass.getField("NO_SESSIONS");
Constructor<?> constructor = contextClass.getConstructor(int.class);
return constructor.newInstance(noSessionsField.getInt(null));
}

private static void addServlet(Object context, HttpServlet servlet, String pathSpec) throws Exception {
Class<?> holderClass = Class.forName(JETTY_SERVLET_PACKAGE + ".ServletHolder");
Constructor<?> holderConstructor = holderClass.getConstructor(Class.forName("jakarta.servlet.Servlet"));
Object servletHolder = holderConstructor.newInstance(servlet);
Method addServletMethod = context.getClass().getMethod("addServlet", holderClass, String.class);
addServletMethod.invoke(context, servletHolder, pathSpec);
}

private static Object invoke(Object target, String methodName) throws Exception {
Method method = target.getClass().getMethod(methodName);
return method.invoke(target);
}

private static Object invoke(Object target, String methodName, Class<?>[] parameterTypes, Object... arguments) throws Exception {
Method method = target.getClass().getMethod(methodName, parameterTypes);
return method.invoke(target, arguments);
}
}
Loading