Skip to content

Upgrade Jetty to 9.4.58.v20250814 and de-aggregate jetty-all (#943) #971

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
slachiewicz merged 1 commit into from
Sep 3, 2026
Merged

Upgrade Jetty to 9.4.58.v20250814 and de-aggregate jetty-all (#943) #971

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
8 changes: 5 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,11 @@ under the License.
</dependency>

<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<version>9.2.30.v20200428</version>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-bom</artifactId>
<version>9.4.58.v20250814</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
20 changes: 18 additions & 2 deletions wagon-provider-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,24 @@ under the License.
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
11 changes: 10 additions & 1 deletion wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.security.UserStore;
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
Expand Down Expand Up @@ -427,6 +428,7 @@ public void testGzipGet() throws Exception {
root.setResourceBase(localRepositoryPath);
ServletHolder servletHolder = new ServletHolder(new DefaultServlet());
servletHolder.setInitParameter("gzip", "true");
servletHolder.setInitParameter("precompressed", "true");
root.addServlet(servletHolder, "/*");
addConnector(server);
server.setHandler(root);
Expand Down Expand Up @@ -1475,6 +1477,11 @@ private String writeTestFile(File parent, String child, String compressionType)
OutputStream out = new FileOutputStream(file);
try {
out.write(child.getBytes());
// Pad uncompressed file so compressed.length() < uncompressed.length()
// (Jetty 9.4 ResourceService only serves precompressed files if compressed size is smaller)
for (int i = 0; i < 100; i++) {
out.write(child.getBytes());
}
} finally {
out.close();
}
Expand Down Expand Up @@ -1982,7 +1989,9 @@ protected TestSecurityHandler createSecurityHandler() {

TestSecurityHandler sh = new TestSecurityHandler();
HashLoginService hashLoginService = new HashLoginService("MyRealm");
hashLoginService.putUser("user", new Password("secret"), new String[] {"admin"});
UserStore userStore = new UserStore();
userStore.addUser("user", new Password("secret"), new String[] {"admin"});
hashLoginService.setUserStore(userStore);
sh.setLoginService(hashLoginService);
sh.setConstraintMappings(new ConstraintMapping[] {cm});
sh.setAuthenticator(new BasicAuthenticator());
Expand Down
9 changes: 7 additions & 2 deletions wagon-providers/wagon-http-lightweight/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,13 @@ under the License.
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
14 changes: 12 additions & 2 deletions wagon-providers/wagon-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,18 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
18 changes: 13 additions & 5 deletions ...gon-http/src/test/java/org/apache/maven/wagon/providers/http/ErrorWithMessageServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,24 @@ public class ErrorWithMessageServlet extends HttpServlet {
public static final String MESSAGE = "it sucks!";

public void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
int status = 0;
if (request.getPathInfo().endsWith("/401")) {
response.sendError(401, MESSAGE);
status = 401;
} else if (request.getPathInfo().endsWith("/403")) {
response.sendError(403, MESSAGE);
status = 403;
} else if (request.getPathInfo().endsWith("/404")) {
response.sendError(404, MESSAGE);
status = 404;
} else if (request.getPathInfo().endsWith("/407")) {
response.sendError(407, MESSAGE);
status = 407;
} else if (request.getPathInfo().endsWith("/500")) {
response.sendError(500, MESSAGE);
status = 500;
}
if (status > 0) {
if (response instanceof org.eclipse.jetty.server.Response) {
((org.eclipse.jetty.server.Response) response).setStatusWithReason(status, MESSAGE);
} else {
response.sendError(status, MESSAGE);
}
}
}
}
2 changes: 0 additions & 2 deletions ...http/src/test/java/org/apache/maven/wagon/providers/http/HttpWagonHttpServerTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ protected void startTestServer(TestInfo testInfo) throws Exception {
server = new Server(0);

context = new ServletContextHandler(ServletContextHandler.SESSIONS);
resourceHandler = new ResourceHandler();
context.setHandler(resourceHandler);
server.setHandler(context);
}

Expand Down
4 changes: 2 additions & 2 deletions wagon-providers/wagon-ssh/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
14 changes: 12 additions & 2 deletions wagon-providers/wagon-webdav-jackrabbit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,18 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
20 changes: 18 additions & 2 deletions wagon-tcks/wagon-tck-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,24 @@ under the License.
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
11 changes: 8 additions & 3 deletions ...s/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/fixture/ServerFixture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
import org.eclipse.jetty.security.UserStore;
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.handler.DefaultHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.session.AbstractSessionManager;
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.FilterMapping;
Expand Down Expand Up @@ -69,6 +70,7 @@ public class ServerFixture {
private final WebAppContext webappContext;

private final HashLoginService loginService;
private final UserStore userStore;

private final ConstraintSecurityHandler securityHandler;

Expand Down Expand Up @@ -111,9 +113,12 @@ public ServerFixture(final boolean ssl) throws URISyntaxException, IOException {
securityHandler = new ConstraintSecurityHandler();

loginService = new HashLoginService("Test Server");
userStore = new UserStore();
loginService.setUserStore(userStore);

securityHandler.setLoginService(loginService);
securityHandler.setConstraintMappings(new ConstraintMapping[] {cm});
securityHandler.setAuthenticator(new BasicAuthenticator());

webappContext = new WebAppContext();
webappContext.setContextPath("/");
Expand All @@ -124,7 +129,7 @@ public ServerFixture(final boolean ssl) throws URISyntaxException, IOException {
webappContext.setHandler(securityHandler);

SessionHandler sessionHandler = webappContext.getSessionHandler();
((AbstractSessionManager) sessionHandler.getSessionManager()).setUsingCookies(false);
sessionHandler.setUsingCookies(false);

HandlerCollection handlers = new HandlerCollection();
handlers.setHandlers(new Handler[] {webappContext, new DefaultHandler()});
Expand All @@ -150,7 +155,7 @@ public void addServlet(final String pathSpec, final Servlet servlet) {
}

public void addUser(final String user, final String password) {
loginService.putUser(user, new Password(password), new String[] {"allowed"});
userStore.addUser(user, new Password(password), new String[] {"allowed"});
}

public Server getServer() {
Expand Down
Loading