Skip to content

HADOOP-19970. Resolve one Jetty release and one servlet API on every module classpath #8699

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
joseluisll wants to merge 5 commits into
base: trunk
Choose a base branch
from
+275 −93
Open

HADOOP-19970. Resolve one Jetty release and one servlet API on every module classpath #8699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18f727d
HADOOP-19970. Resolve a single Jetty release and servlet API on every…
joseluisll Aug 21, 2026
be860be
HADOOP-19970. Move Jersey's test container off Jetty.
joseluisll Aug 24, 2026
cd9c9ef
HADOOP-19970. Log through SLF4J in JobEndNotifier.
joseluisll Aug 26, 2026
02803d0
HADOOP-19970. Take the servlet API from Jetty.
joseluisll Aug 31, 2026
cfb6dbb
HADOOP-19970. Keep jetty-util in the shaded minicluster.
joseluisll Sep 3, 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
7 changes: 3 additions & 4 deletions LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ org.eclipse.jetty:jetty-util:9.4.58.v20250814
org.eclipse.jetty:jetty-util-ajax:9.4.58.v20250814
org.eclipse.jetty:jetty-webapp:9.4.58.v20250814
org.eclipse.jetty:jetty-xml:9.4.58.v20250814
org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.9
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.58.v20250814
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.58.v20250814
org.ehcache:ehcache:3.8.2
Expand Down Expand Up @@ -625,7 +626,6 @@ CDDL 1.1 + GPLv2 with classpath exception
com.sun.xml.bind:jaxb-impl:2.2.3-1
javax.annotation:javax.annotation-api:1.3.2
javax.cache:cache-api:1.1.1
javax.servlet:javax.servlet-api:3.1.0
javax.servlet.jsp:jsp-api:2.1
javax.websocket:javax.websocket-api:1.0

Expand All @@ -645,8 +645,6 @@ Eclipse Public License (EPL) 2.0
--------------------------

jakarta.ws.rs-api:jakarta.ws.rs-api:2.1.6
jakarta.servlet.jsp:jakarta.servlet.jsp-api:2.3.6
jakarta.servlet:jakarta.servlet-api:4.0.4

Eclipse Public License (EPL) 2.0 with some parts being
GNU General Public License (GPL), Version 2, With Classpath Exception,
Expand All @@ -660,9 +658,10 @@ org.glassfish.jersey.core:jersey-server:2.46
org.glassfish.jersey.inject:jersey-hk2:2.46
org.glassfish.jersey.core:jersey-client:2.46
org.glassfish.jersey.test-framework:jersey-test-framework-core:2.46
org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty:2.46
org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http:2.46
org.glassfish.jersey.containers:jersey-container-servlet:2.46
org.glassfish.jersey.containers:jersey-container-servlet-core:2.46
org.glassfish.jersey.containers:jersey-container-jdk-http:2.46
org.glassfish.jersey.media:jersey-media-json-jettison:2.46
org.glassfish.jersey.media:jersey-media-jaxb:2.46

Expand Down
1 change: 0 additions & 1 deletion NOTICE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,6 @@ Oracle
The following artifacts are CDDL + GPLv2 with classpath exception.
https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html

* javax.servlet:javax.servlet-api
* javax.annotation:javax.annotation-api
* javax.transaction:javax.transaction-api
* javax.websocket:javax.websocket-api
Expand Down
31 changes: 21 additions & 10 deletions hadoop-client-modules/hadoop-client-minicluster/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
Expand Down Expand Up @@ -419,10 +419,19 @@
</dependency>
<!-- Add back in the transitive dependencies excluded from hadoop-common in client TODO remove once we have a filter for "is in these artifacts" -->
<!-- skip javax.servlet:javax.servlet-api because it's in client -->
<!-- skip jakarta.servlet:jakarta.servlet-api because it's in client -->
<!-- skip org.eclipse.jetty.toolchain:jetty-servlet-api because it's in client -->
<!-- skip jakarta.ws.rs-api:jakarta.ws.rs because it's in client -->
<!-- Skip commons-logging:commons-logging-api because it looks like nothing actually included it -->
<!-- Skip jetty-util because it's in client -->
<!-- jetty-util is not in client: hadoop-client-runtime excludes it, along with
jetty-server, so that the Jetty classes it ships do not duplicate the ones
here. The minicluster is where they belong, and jetty-server already
reaches it through hadoop-minicluster. jetty-util is excluded on those
same paths, so it is declared here instead. -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
Expand Down Expand Up @@ -464,7 +473,7 @@
</dependency>
<!-- add back in transitive dependencies of hadoop-mapreduce-client-app removed in client -->
<!-- Skipping javax.servlet:javax.servlet-api because it's in client -->
<!-- Skipping jakarta.servlet:jakarta.servlet-api because it's in client -->
<!-- Skipping org.eclipse.jetty.toolchain:jetty-servlet-api because it's in client -->
<!-- Skipping jakarta.ws.rs-api:jakarta.ws.rs because it's in client -->
<dependency>
<groupId>org.apache.hadoop</groupId>
Expand All @@ -476,8 +485,8 @@
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
Expand Down Expand Up @@ -551,8 +560,8 @@
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
Expand Down Expand Up @@ -632,7 +641,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-jetty</artifactId>
<artifactId>jersey-test-framework-provider-jdk-http</artifactId>
<exclusions>
<exclusion>
<groupId>jakarta.ws.rs</groupId>
Expand Down Expand Up @@ -940,11 +949,13 @@
<exclude>com/sun/security/*</exclude>
<exclude>com/sun/jndi/*</exclude>
<exclude>com/sun/management/*</exclude>
<exclude>com/sun/net/httpserver/*</exclude>
<exclude>com/sun/tools/**/*</exclude>
<exclude>com/sun/javadoc/**/*</exclude>
<exclude>com/sun/security/**/*</exclude>
<exclude>com/sun/jndi/**/*</exclude>
<exclude>com/sun/management/**/*</exclude>
<exclude>com/sun/net/httpserver/**/*</exclude>
<exclude>com/ibm/security/*</exclude>
<exclude>com/ibm/security/**/*</exclude>
<!-- Exclude zstd-jni -->
Expand Down
1 change: 0 additions & 1 deletion hadoop-client-modules/hadoop-client-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@
<exclude>org.eclipse.jetty:jetty-util</exclude>
<exclude>org.eclipse.jetty:jetty-util-ajax</exclude>
<exclude>org.eclipse.jetty:jetty-server</exclude>
<exclude>org.eclipse.jetty:jetty-continuation</exclude>
<exclude>org.ow2.asm:*</exclude>
<!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->
<exclude>org.bouncycastle:*</exclude>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-common-project/hadoop-auth-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-common-project/hadoop-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
16 changes: 11 additions & 5 deletions hadoop-common-project/hadoop-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@
<artifactId>commons-collections4</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
Expand Down Expand Up @@ -126,6 +121,17 @@
<artifactId>jakarta.activation-api</artifactId>
<scope>runtime</scope>
</dependency>
<!--
HttpServer2 and the filters around it are written against javax.servlet.
The API used to arrive only as a transitive of jetty-server; it is declared
here so the module states which servlet API it compiles against instead of
depending on which jar happened to come first on the classpath.
-->
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-common-project/hadoop-kms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-common-project/hadoop-nfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>${transient.protobuf2.scope}</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdfs-project/hadoop-hdfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<scope>${transient.protobuf2.scope}</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-jetty</artifactId>
<artifactId>jersey-test-framework-provider-jdk-http</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
34 changes: 19 additions & 15 deletions ...mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
import org.apache.hadoop.mapreduce.CustomJobEndNotifier;
import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.hadoop.mapreduce.v2.api.records.JobReport;
import org.eclipse.jetty.util.log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* <p>This class handles job end notification. Submitters of jobs can choose to
Expand All @@ -48,6 +49,9 @@
* (eg. SUCCEEDED/KILLED/FAILED) </li> </ul>
*/
public class JobEndNotifier implements Configurable {
private static final Logger LOG =
LoggerFactory.getLogger(JobEndNotifier.class);

private static final String JOB_ID = "$jobId";
private static final String JOB_STATUS = "$jobStatus";

Expand Down Expand Up @@ -109,11 +113,11 @@ public void setConf(Configuration conf) {
int port = Integer.parseInt(portConf);
proxyToUse = new Proxy(proxyType,
new InetSocketAddress(hostname, port));
Log.getLog().info("Job end notification using proxy type \""
LOG.info("Job end notification using proxy type \""
+ proxyType + "\" hostname \"" + hostname + "\" and port \"" + port
+ "\"");
} catch(NumberFormatException nfe) {
Log.getLog().warn("Job end notification couldn't parse configured"
LOG.warn("Job end notification couldn't parse configured"
+ "proxy's port " + portConf + ". Not going to use a proxy");
}
}
Expand Down Expand Up @@ -141,24 +145,24 @@ protected boolean notifyURLOnce() {
private boolean notifyViaBuiltInNotifier() {
boolean success = false;
try {
Log.getLog().info("Job end notification trying " + urlToNotify);
LOG.info("Job end notification trying " + urlToNotify);
HttpURLConnection conn =
(HttpURLConnection) urlToNotify.openConnection(proxyToUse);
conn.setConnectTimeout(timeout);
conn.setReadTimeout(timeout);
conn.setAllowUserInteraction(false);
if(conn.getResponseCode() != HttpURLConnection.HTTP_OK) {
Log.getLog().warn("Job end notification to " + urlToNotify
LOG.warn("Job end notification to " + urlToNotify
+ " failed with code: " + conn.getResponseCode() + " and message \""
+ conn.getResponseMessage() + "\"");
}
else {
success = true;
Log.getLog().info("Job end notification to " + urlToNotify
LOG.info("Job end notification to " + urlToNotify

@pan3793 pan3793 Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please also change it to {} placeholder style, and I think org.eclipse.jetty.util.log.Log => org.slf4j.Logger worth a dedicated PR and we can do a backport

+ " succeeded");
}
} catch(IOException ioe) {
Log.getLog().warn("Job end notification to " + urlToNotify + " failed",
LOG.warn("Job end notification to " + urlToNotify + " failed",
ioe);
}
return success;
Expand All @@ -169,7 +173,7 @@ private boolean notifyViaBuiltInNotifier() {
*/
private boolean notifyViaCustomNotifier() {
try {
Log.getLog().info("Will be using " + customJobEndNotifierClassName
LOG.info("Will be using " + customJobEndNotifierClassName
+ " for Job end notification");

final Class<? extends CustomJobEndNotifier> customJobEndNotifierClass =
Expand All @@ -180,15 +184,15 @@ private boolean notifyViaCustomNotifier() {

boolean success = customJobEndNotifier.notifyOnce(urlToNotify, conf);
if (success) {
Log.getLog().info("Job end notification to " + urlToNotify
LOG.info("Job end notification to " + urlToNotify
+ " succeeded");
} else {
Log.getLog().warn("Job end notification to " + urlToNotify
LOG.warn("Job end notification to " + urlToNotify
+ " failed");
}
return success;
} catch (Exception e) {
Log.getLog().warn("Job end notification to " + urlToNotify
LOG.warn("Job end notification to " + urlToNotify
+ " failed", e);
return false;
}
Expand All @@ -215,24 +219,24 @@ public void notify(JobReport jobReport)
try {
urlToNotify = new URL(userUrl);
} catch (MalformedURLException mue) {
Log.getLog().warn("Job end notification couldn't parse " + userUrl, mue);
LOG.warn("Job end notification couldn't parse " + userUrl, mue);
return;
}

// Send notification
boolean success = false;
while (numTries-- > 0 && !success) {
Log.getLog().info("Job end notification attempts left " + numTries);
LOG.info("Job end notification attempts left " + numTries);
success = notifyURLOnce();
if (!success) {
Thread.sleep(waitInterval);
}
}
if (!success) {
Log.getLog().warn("Job end notification failed to notify : "
LOG.warn("Job end notification failed to notify : "
+ urlToNotify);
} else {
Log.getLog().info("Job end notification succeeded for "
LOG.info("Job end notification succeeded for "
+ jobReport.getJobId());
}
}
Expand Down
5 changes: 5 additions & 0 deletions hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@
<groupId>${leveldbjni.group}</groupId>
<artifactId>leveldbjni-all</artifactId>
</dependency>
<!-- ShuffleChannelHandler uses org.eclipse.jetty.http.HttpHeader -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-jetty</artifactId>
<artifactId>jersey-test-framework-provider-jdk-http</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
Loading
Loading