Skip to content

AVRO-4192: [JAVA] Update Jetty to version 12.1.4 #3542

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
andrewlamb-est wants to merge 1 commit into
base: main
Choose a base branch
from
Open

AVRO-4192: [JAVA] Update Jetty to version 12.1.4 #3542

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
4 changes: 2 additions & 2 deletions lang/java/ipc-jetty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
<artifactId>jetty-server</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty.${jetty.ee.version}</groupId>
<artifactId>jetty-${jetty.ee.version}-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
23 changes: 10 additions & 13 deletions lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/HttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.ee9.servlet.ServletHolder;

/** An HTTP-based RPC {@link Server}. */
public class HttpServer implements Server {
Expand Down Expand Up @@ -71,10 +70,8 @@ public HttpServer(ResponderServlet servlet, String bindAddress, int port) throws
connector.setPort(port);
server.addConnector(connector);

ServletHandler handler = new ServletHandler();
handler.addServletWithMapping(new ServletHolder(servlet), "/*");
ServletContextHandler sch = new ServletContextHandler();
sch.setServletHandler(handler);
sch.getServletHandler().addServletWithMapping(new ServletHolder(servlet), "/*");
server.setHandler(sch);
}

Expand Down Expand Up @@ -103,9 +100,9 @@ public HttpServer(ResponderServlet servlet, ConnectionFactory connectionFactory,
connector.setPort(port);

server.addConnector(connector);
ServletHandler handler = new ServletHandler();
server.setHandler(handler);
handler.addServletWithMapping(new ServletHolder(servlet), "/*");
ServletContextHandler sch = new ServletContextHandler();
server.setHandler(sch);
sch.getServletHandler().addServletWithMapping(new ServletHolder(servlet), "/*");
}

/**
Expand All @@ -119,9 +116,9 @@ public HttpServer(ResponderServlet servlet, Connector connector) throws IOExcept
if (server.getConnectors().length == 0 || Arrays.asList(server.getConnectors()).contains(connector)) {
server.addConnector(connector);
}
ServletHandler handler = new ServletHandler();
server.setHandler(handler);
handler.addServletWithMapping(new ServletHolder(servlet), "/*");
ServletContextHandler sch = new ServletContextHandler();
server.setHandler(sch);
sch.getServletHandler().addServletWithMapping(new ServletHolder(servlet), "/*");
}

/**
Expand Down Expand Up @@ -154,7 +151,7 @@ public void close() {

/**
* Start the server.
*
*
* @throws AvroRuntimeException if the underlying Jetty server throws any
* exception while starting.
*/
Expand Down
20 changes: 12 additions & 8 deletions lang/java/ipc-jetty/src/main/java/org/apache/avro/ipc/jetty/StatsServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@
import org.apache.avro.ipc.stats.StatsPlugin;
import org.apache.avro.ipc.stats.StatsServlet;

import org.eclipse.jetty.ee9.servlet.ServletContextHandler;
import org.eclipse.jetty.ee9.servlet.ServletHolder;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerList;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.resource.ResourceFactory;

/* This is a server that displays live information from a StatsPlugin.
*
Expand All @@ -54,21 +55,24 @@ public StatsServer(StatsPlugin plugin, int port) throws Exception {
ServletHolder servletHolder = new ServletHolder(new StatsServlet(plugin));
servletContext.addServlet(servletHolder, "/");

HandlerList handlers = new HandlerList(servletContext);
Handler.Sequence handlers = new Handler.Sequence();

Resource classPathResource = Resource.newClassPathResource("/org/apache/avro/ipc/stats/static");
if (classPathResource.exists() && classPathResource.isDirectory()) {
ResourceFactory resourceFactory = ResourceFactory.of(httpServer);
Resource classPathResource = resourceFactory.newResource("/org/apache/avro/ipc/stats/static");
if (classPathResource != null && classPathResource.exists() && classPathResource.isDirectory()) {
ResourceHandler resourceHandler = new ResourceHandler();
resourceHandler.setBaseResource(classPathResource);
resourceHandler.setDirectoriesListed(false); // Optional: prevent directory listing
resourceHandler.setDirAllowed(false); // Optional: prevent directory listing

ContextHandler staticContext = new ContextHandler();
staticContext.setContextPath("/static");
staticContext.setHandler(resourceHandler);

handlers.prependHandler(staticContext);
handlers.addHandler(staticContext);
}

handlers.addHandler(servletContext);

httpServer.setHandler(handlers);

httpServer.start();
Expand Down
2 changes: 1 addition & 1 deletion lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestProtocolHttps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public Server createServer(Responder testResponder) throws Exception {
System.setProperty("javax.net.ssl.trustStore", "src/test/truststore");
System.setProperty("javax.net.ssl.trustStorePassword", "avrotest");
SslConnectionFactory connectionFactory = new SslConnectionFactory("HTTP/1.1");
SslContextFactory sslContextFactory = connectionFactory.getSslContextFactory();
SslContextFactory.Server sslContextFactory = connectionFactory.getSslContextFactory();

sslContextFactory.setKeyStorePath(System.getProperty("javax.net.ssl.keyStore"));
sslContextFactory.setKeyManagerPassword(System.getProperty("javax.net.ssl.password"));
Expand Down
6 changes: 3 additions & 3 deletions lang/java/ipc-jetty/src/test/java/org/apache/avro/ipc/jetty/TestStatsPluginAndServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.nio.ByteBuffer;
import java.util.Random;

import javax.servlet.UnavailableException;
import jakarta.servlet.UnavailableException;

import org.apache.avro.AvroRemoteException;
import org.apache.avro.Protocol;
Expand Down Expand Up @@ -164,11 +164,11 @@ public Object respond(Message message, Object request) throws AvroRemoteExceptio
/**
* Demo program for using RPC stats. This automatically generates client RPC
* requests. Alternatively a can be used (as below) to trigger RPCs.
*
*
* <pre>
* java -jar build/avro-tools-*.jar rpcsend '{"protocol":"sleepy","namespace":null,"types":[],"messages":{"sleep":{"request":[{"name":"millis","type":"long"}],"response":"null"}}}' sleep localhost 7002 '{"millis": 20000}'
* </pre>
*
*
* @param args
* @throws Exception
*/
Expand Down
4 changes: 2 additions & 2 deletions lang/java/ipc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
<artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- javax.annotation-api dependency must be explicit for forward compatibility (Java > 9) -->
Expand Down
8 changes: 4 additions & 4 deletions lang/java/ipc/src/main/java/org/apache/avro/ipc/ResponderServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import java.nio.ByteBuffer;
import java.util.List;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;

import org.apache.avro.AvroRuntimeException;

Expand Down
10 changes: 5 additions & 5 deletions lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StatsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
import java.util.Set;
import java.util.Map.Entry;

import javax.servlet.ServletException;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletException;
import jakarta.servlet.UnavailableException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
Expand Down
13 changes: 7 additions & 6 deletions lang/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@
<hadoop.version>3.4.3</hadoop.version>
<hamcrest.version>3.0</hamcrest.version>
<jackson-bom.version>2.22.0</jackson-bom.version>
<jetty.version>9.4.58.v20250814</jetty.version>
<jetty.ee.version>ee9</jetty.ee.version>
<jetty.version>12.1.4</jetty.version>
<jopt-simple.version>5.0.4</jopt-simple.version>
<junit5.version>5.14.4</junit5.version>
<maven-core.version>3.9.6</maven-core.version>
<mockito.version>5.23.0</mockito.version>
<netty.version>4.2.15.Final</netty.version>
<protobuf.version>4.35.1</protobuf.version>
<reload4j.version>1.2.26</reload4j.version>
<servlet-api.version>4.0.1</servlet-api.version>
<servlet-api.version>6.0.0</servlet-api.version>
<slf4j.version>2.0.18</slf4j.version>
<snappy.version>1.1.10.8</snappy.version>
<thrift.version>0.20.0</thrift.version>
Expand Down Expand Up @@ -534,8 +535,8 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty.${jetty.ee.version}</groupId>
<artifactId>jetty-${jetty.ee.version}-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
Expand All @@ -544,8 +545,8 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${servlet-api.version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>11</maxJdkVersion>
<maxJdkVersion>17</maxJdkVersion>
<ignoredScopes>
<ignoredScope>test</ignoredScope>
<ignoredScope>provided</ignoredScope>
Expand Down