HADOOP-19970. Move the servlet API to javax.servlet-api 4.0.1.

LICENSE-binary

@@ -625,9 +625,8 @@ 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:javax.servlet-api:4.0.1
 javax.servlet.jsp:jsp-api:2.1
 javax.websocket:javax.websocket-api:1.0
 
@@ -646,9 +645,9 @@ org.jacoco:org.jacoco.agent:0.8.5
 Eclipse Public License (EPL) 2.0
 --------------------------
 
+jakarta.annotation:jakarta.annotation-api:1.3.5
 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,
@@ -662,7 +661,8 @@ 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-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.media:jersey-media-json-jettison:2.46

NOTICE-binary

@@ -456,6 +456,9 @@ The following artifacts are EPL and ASL2.
 The following artifacts are EPL and CDDL 1.0.
  * org.eclipse.jetty.orbit:javax.mail.glassfish
 
+The following artifacts are EPL 2.0 and GPLv2 with classpath exception.
+ * jakarta.annotation:jakarta.annotation-api
+
 
 ------
 Oracle
@@ -464,7 +467,6 @@ 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
 

hadoop-client-modules/hadoop-client-minicluster/pom.xml

@@ -123,10 +123,6 @@
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>jakarta.servlet</groupId>
-          <artifactId>jakarta.servlet-api</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>jakarta.ws.rs</groupId>
           <artifactId>jakarta.ws.rs-api</artifactId>
@@ -419,10 +415,9 @@
     </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 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; it is declared directly further down -->
     <dependency>
       <groupId>org.glassfish.jersey.core</groupId>
       <artifactId>jersey-common</artifactId>
@@ -464,7 +459,6 @@
     </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 jakarta.ws.rs-api:jakarta.ws.rs because it's in client -->
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -475,10 +469,6 @@
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>jakarta.servlet</groupId>
-          <artifactId>jakarta.servlet-api</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>jakarta.ws.rs</groupId>
           <artifactId>jakarta.ws.rs-api</artifactId>
@@ -550,10 +540,6 @@
           <groupId>javax.servlet</groupId>
           <artifactId>javax.servlet-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>jakarta.servlet</groupId>
-          <artifactId>jakarta.servlet-api</artifactId>
-        </exclusion>
         <exclusion>
           <groupId>jakarta.ws.rs</groupId>
           <artifactId>jakarta.ws.rs-api</artifactId>
@@ -619,10 +605,6 @@
           <groupId>jakarta.ws.rs</groupId>
           <artifactId>jakarta.ws.rs-api</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>jakarta.servlet</groupId>
-          <artifactId>jakarta.servlet-api</artifactId>
-        </exclusion>
         <exclusion>
           <artifactId>junit-jupiter</artifactId>
           <groupId>org.junit.jupiter</groupId>
@@ -632,7 +614,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>
@@ -645,6 +627,13 @@
       </exclusions>
       <optional>true</optional>
     </dependency>
+    <!-- jetty-util is excluded above as "in client", but hadoop-client-runtime does not shade
+         it, so declare it directly to keep it in this jar. -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util</artifactId>
+      <optional>true</optional>
+    </dependency>
     <!-- skipping jersey-server because it's above -->
     <!-- skipping guice-servlet because it's above -->
     <!-- skipping avro because it is in client via hadoop-common -->
@@ -740,6 +729,15 @@
                         <exclude>**/Test*.class</exclude>
                       </excludes>
                     </filter>
+                    <!-- Test support of hadoop-common's TestJettyClasspath tests: it checks a
+                         module's own test classpath and is not for minicluster users. -->
+                    <filter>
+                      <artifact>org.apache.hadoop:hadoop-common:*</artifact>
+                      <excludes>
+                        <exclude>org/apache/hadoop/test/AbstractJettyClasspathTest.class</exclude>
+                        <exclude>org/apache/hadoop/test/ClasspathTestUtils.class</exclude>
+                      </excludes>
+                    </filter>
                     <!-- Since runtime has classes for these jars, we exclude them.
                          We still want the java services api files, since those were excluded in runtime
                       -->
@@ -945,6 +943,8 @@
                         <exclude>com/sun/security/**/*</exclude>
                         <exclude>com/sun/jndi/**/*</exclude>
                         <exclude>com/sun/management/**/*</exclude>
+                        <exclude>com/sun/net/httpserver/*</exclude>
+                        <exclude>com/sun/net/httpserver/**/*</exclude>
                         <exclude>com/ibm/security/*</exclude>
                         <exclude>com/ibm/security/**/*</exclude>
                         <!-- Exclude zstd-jni -->

hadoop-common-project/hadoop-auth-examples/pom.xml

@@ -32,8 +32,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

hadoop-common-project/hadoop-auth/pom.xml

@@ -62,8 +62,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>jakarta.servlet</groupId>
-      <artifactId>jakarta.servlet-api</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

hadoop-common-project/hadoop-common/pom.xml

@@ -131,6 +131,17 @@
       <artifactId>jetty-server</artifactId>
       <scope>compile</scope>
     </dependency>
+    <!--
+      HttpServer2 and the filters around it are written against javax.servlet.
+      The API used to arrive only transitively, through jetty-server; declare
+      it, so this module, and the modules that get the API through it, state
+      which servlet API they compile and run against.
+    -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
@@ -142,6 +153,15 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!-- Optional: compiled against here, but projects that depend on
+         hadoop-common keep getting it through jetty-server, so declaring it
+         does not change what Maven resolves for them. -->
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java

@@ -1960,9 +1960,7 @@ public void doFilter(ServletRequest request,
      */
     private String inferMimeType(ServletRequest request) {
       String path = ((HttpServletRequest)request).getRequestURI();
-      ServletContextHandler.Context sContext =
-          (ServletContextHandler.Context)config.getServletContext();
-      String mime = sContext.getMimeType(path);
+      String mime = config.getServletContext().getMimeType(path);
       return (mime == null) ? null : mime;
     }
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java

@@ -36,7 +36,8 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.eclipse.jetty.util.log.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -58,6 +59,9 @@
  * </p>
  */
 public abstract class FSMainOperationsBaseTest extends FileSystemTestHelper {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(FSMainOperationsBaseTest.class);
+
 
   private static String TEST_DIR_AAA2 = "test/hadoop2/aaa";
   private static String TEST_DIR_AAA = "test/hadoop/aaa";
@@ -803,7 +807,7 @@ public void testRenameNonExistentPath() throws Exception {
       rename(src, dst, false, false, false, Rename.NONE);
       fail("Should throw FileNotFoundException");
     } catch (IOException e) {
-      Log.getLog().info("XXX", e);
+      LOG.info("XXX", e);
       assertTrue(unwrapException(e) instanceof FileNotFoundException);
     }
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFileSystemTestSetup.java

@@ -26,7 +26,8 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.viewfs.ConfigUtil;
 import org.apache.hadoop.util.Shell;
-import org.eclipse.jetty.util.log.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -46,6 +47,9 @@
  * We also set the view file system's wd to point to the wd. 
  */
 public class ViewFileSystemTestSetup {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ViewFileSystemTestSetup.class);
+
 
   static public String ViewFSTestDir = "/testDir";
 
@@ -83,7 +87,7 @@ static public FileSystem setupForViewFileSystem(Configuration conf, FileSystemTe
 
     FileSystem fsView = FileSystem.get(FsConstants.VIEWFS_URI, conf);
     fsView.setWorkingDirectory(new Path(wdDir)); // in case testdir relative to wd.
-    Log.getLog().info("Working dir is: " + fsView.getWorkingDirectory());
+    LOG.info("Working dir is: " + fsView.getWorkingDirectory());
     return fsView;
   }
 
@@ -117,12 +121,12 @@ static void setUpHomeDir(Configuration conf, FileSystem fsTarget) {
     } else { // home dir is at root. Just link the home dir itse
       URI linkTarget = fsTarget.makeQualified(new Path(homeDir)).toUri();
       ConfigUtil.addLink(conf, homeDir, linkTarget);
-      Log.getLog().info("Added link for home dir " + homeDir + "->" + linkTarget);
+      LOG.info("Added link for home dir " + homeDir + "->" + linkTarget);
     }
     // Now set the root of the home dir for viewfs
     String homeDirRoot = fsTarget.getHomeDirectory().getParent().toUri().getPath();
     ConfigUtil.setHomeDirConf(conf, homeDirRoot);
-    Log.getLog().info("Home dir base for viewfs" + homeDirRoot);
+    LOG.info("Home dir base for viewfs" + homeDirRoot);
   }
 
   /*
@@ -137,7 +141,7 @@ static void linkUpFirstComponents(Configuration conf, String path, FileSystem fs
     String firstComponent = path.substring(0, indexOfEnd);
     URI linkTarget = fsTarget.makeQualified(new Path(firstComponent)).toUri();
     ConfigUtil.addLink(conf, firstComponent, linkTarget);
-    Log.getLog().info("Added link for " + info + " "
+    LOG.info("Added link for " + info + " "
         + firstComponent + "->" + linkTarget);    
   }
 }

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/viewfs/ViewFsTestSetup.java

@@ -32,7 +32,8 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.viewfs.ViewFileSystemOverloadScheme.ChildFsGetter;
 import org.apache.hadoop.util.Shell;
-import org.eclipse.jetty.util.log.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -53,6 +54,9 @@
  */
 
 public class ViewFsTestSetup {
+  private static final Logger LOG =
+      LoggerFactory.getLogger(ViewFsTestSetup.class);
+
 
   static public String ViewFSTestDir = "/testDir";
 
@@ -88,7 +92,7 @@ static public FileContext setupForViewFsLocalFs(FileContextTestHelper helper) th
 
     FileContext fc = FileContext.getFileContext(FsConstants.VIEWFS_URI, conf);
     fc.setWorkingDirectory(new Path(wdDir)); // in case testdir relative to wd.
-    Log.getLog().info("Working dir is: " + fc.getWorkingDirectory());
+    LOG.info("Working dir is: " + fc.getWorkingDirectory());
     //System.out.println("SRCOfTests = "+ getTestRootPath(fc, "test"));
     //System.out.println("TargetOfTests = "+ targetOfTests.toUri());
     return fc;
@@ -113,12 +117,12 @@ static void setUpHomeDir(Configuration conf, FileContext fsTarget) {
     } else { // home dir is at root. Just link the home dir itse
       URI linkTarget = fsTarget.makeQualified(new Path(homeDir)).toUri();
       ConfigUtil.addLink(conf, homeDir, linkTarget);
-      Log.getLog().info("Added link for home dir " + homeDir + "->" + linkTarget);
+      LOG.info("Added link for home dir " + homeDir + "->" + linkTarget);
     }
     // Now set the root of the home dir for viewfs
     String homeDirRoot = fsTarget.getHomeDirectory().getParent().toUri().getPath();
     ConfigUtil.setHomeDirConf(conf, homeDirRoot);
-    Log.getLog().info("Home dir base for viewfs" + homeDirRoot);
+    LOG.info("Home dir base for viewfs" + homeDirRoot);
   }
 
   /*
@@ -134,7 +138,7 @@ static void linkUpFirstComponents(Configuration conf, String path,
     String firstComponent = path.substring(0, indexOfEnd);
     URI linkTarget = fsTarget.makeQualified(new Path(firstComponent)).toUri();
     ConfigUtil.addLink(conf, firstComponent, linkTarget);
-    Log.getLog().info("Added link for " + info + " "
+    LOG.info("Added link for " + info + " "
         + firstComponent + "->" + linkTarget);    
   }