diff --git a/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpFilter.java b/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpFilter.java index 68f2de30681f2..70a176edd9984 100644 --- a/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpFilter.java +++ b/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpFilter.java @@ -41,6 +41,7 @@ // org.apache.hadoop.yarn.server.webproxy.amfilter.AmIpFilter // // Modification: +// Migrate from javax.servlet to jakarta.servlet // Copied constant string definitions from AmFilterInitializer to strip external dependency // - RM_HA_URLS // - PROXY_USER_COOKIE_NAME diff --git a/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpServletRequestWrapper.java b/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpServletRequestWrapper.java index 8588cabe91e38..d2e5ee783c452 100644 --- a/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpServletRequestWrapper.java +++ b/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/AmIpServletRequestWrapper.java @@ -24,6 +24,9 @@ // This class is copied from Hadoop 3.4.0 // org.apache.hadoop.yarn.server.webproxy.amfilter.AmIpServletRequestWrapper +// +// Modification: +// Migrate from javax.servlet to jakarta.servlet public class AmIpServletRequestWrapper extends HttpServletRequestWrapper { private final AmIpPrincipal principal; diff --git a/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/ProxyUtils.java b/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/ProxyUtils.java index 577f11d1f4fbd..0f19f87dd2d7a 100644 --- a/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/ProxyUtils.java +++ b/resource-managers/yarn/src/main/java/org/apache/spark/deploy/yarn/ProxyUtils.java @@ -31,12 +31,13 @@ import java.io.PrintWriter; import java.util.EnumSet; -/** - * Class containing general purpose proxy utilities - * - * This class is copied from Hadoop 3.4.0 - * org.apache.hadoop.yarn.server.webproxy.ProxyUtils - */ +// Class containing general purpose proxy utilities +// +// This class is copied from Hadoop 3.4.0 +// org.apache.hadoop.yarn.server.webproxy.ProxyUtils +// +// Modification: +// Migrate from javax.servlet to jakarta.servlet public class ProxyUtils { private static final Logger LOG = LoggerFactory.getLogger( ProxyUtils.class);