Skip to content

Bump org.eclipse.jetty:jetty-http from 11.0.20 to 12.1.8 #2618

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

Open
dependabot wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bump org.eclipse.jetty:jetty-http from 11.0.20 to 12.1.8 #2618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6122e89
Bump org.eclipse.jetty:jetty-http from 11.0.20 to 12.0.33
dependabot[bot] Apr 14, 2026
4d564ec
fix compile errors
jungm Apr 20, 2026
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
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<version.tomee-quartz-shade>2.5.1</version.tomee-quartz-shade>
<version.xbean>4.30</version.xbean>
<version.groovy>2.4.21</version.groovy>
<version.jetty>11.0.20</version.jetty>
<version.jetty>12.1.8</version.jetty>
<version.ehcache>3.11.1</version.ehcache>
<junit.version>4.13.2</junit.version>
<junit.jupiter.version>5.12.0</junit.jupiter.version>
Expand Down Expand Up @@ -1059,13 +1059,13 @@
<version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp-2.1</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-apache-jsp</artifactId>
<version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-plus</artifactId>
<version>${version.jetty}</version>
</dependency>
<dependency>
Expand All @@ -1074,8 +1074,8 @@
<version>${version.jetty}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-webapp</artifactId>
<version>${version.jetty}</version>
</dependency>
<dependency>
Expand Down
5 changes: 2 additions & 3 deletions server/openejb-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-servlet</artifactId>
<version>${version.jetty}</version>
<optional>true</optional>
</dependency>
Expand Down Expand Up @@ -175,4 +175,3 @@
</dependency>
</dependencies>
</project>

28 changes: 7 additions & 21 deletions server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,19 @@
import org.apache.openejb.loader.Options;
import org.apache.openejb.server.ServiceException;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.AbstractHandler;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SessionIdManager;
import org.eclipse.jetty.server.session.DefaultSessionIdManager;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;

import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.security.SecureRandom;
import java.util.Properties;

/**
Expand Down Expand Up @@ -99,16 +93,15 @@ public void init(final Properties props) throws Exception {
connector.setPort(port);
server.setConnectors(new Connector[]{connector});

final ContextHandler context = new ContextHandler();
final ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
context.setContextPath("/");
final ServletContext servletContext = context.getServletContext();
server.setHandler(context);

final Handler handler = new AbstractHandler() {
context.addServlet(new HttpServlet() {
@Override
public void handle(final String target, final Request request, final HttpServletRequest req, final HttpServletResponse res) throws IOException, ServletException {
protected void service(final HttpServletRequest req, final HttpServletResponse res) throws IOException, ServletException {
try {
request.setHandled(true);
final HttpRequest httpRequest = new ServletRequestAdapter(req, res, servletContext);
final HttpResponse httpResponse = new ServletResponseAdapter(res);
JettyHttpServer.this.listener.onMessage(httpRequest, httpResponse);
Expand All @@ -118,14 +111,7 @@ public void handle(final String target, final Request request, final HttpServlet
throw new ServletException(e);
}
}
};

final SessionHandler sessionHandler = new SessionHandler();
final SessionIdManager sessionManager = new DefaultSessionIdManager(server, new SecureRandom());
sessionHandler.setSessionIdManager(sessionManager);
sessionHandler.setHandler(handler);

context.setHandler(sessionHandler);
}, "/*");
}

@Override
Expand All @@ -145,4 +131,4 @@ public void stop() throws ServiceException {
throw new ServiceException(e);
}
}
}
}