[WIP] Jetty12 + EE10

gradle/libs.versions.toml

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 [versions]
-adobe-testing-s3mock = "2.17.0"
-amazon-awssdk = "2.26.19"
+adobe-testing-s3mock = "3.9.1"
+amazon-awssdk = "2.28.11"
 # @keep Antora version used in ref-guide
 antora = "3.1.4"
 # @keep Most recent commit as of 2022-06-24, this repo does not have tags
@@ -82,7 +82,8 @@ cybozulabs-langdetect = "1.1-20120112"
 diffplug-spotless = "6.5.2"
 dropwizard-metrics = "4.2.26"
 eclipse-ecj = "3.39.0"
-eclipse-jetty = "10.0.22"
+# eclipse-jetty = "10.0.22"
+eclipse-jetty = "12.0.10"
 eclipse-jettytoolchain = "4.0.6"
 # @keep jgit version used by git-status.gradle
 eclipse-jgit = "6.7.0.202309050840-r"
@@ -138,7 +139,7 @@ jayway-jsonpath = "2.9.0"
 jctools = "4.0.5"
 jersey = "3.1.9"
 # TODO Sync with jersey versions
-jersey-containers = "2.39.1"
+jersey-containers = "3.1.0"
 # @keep for version alignment
 joda-time = "2.8.1"
 junit = "4.13.2"
@@ -295,7 +296,7 @@ bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref
 carrot2-core = { module = "org.carrot2:carrot2-core", version.ref = "carrot2-core" }
 carrotsearch-hppc = { module = "com.carrotsearch:hppc", version.ref = "carrotsearch-hppc" }
 carrotsearch-randomizedtesting-runner = { module = "com.carrotsearch.randomizedtesting:randomizedtesting-runner", version.ref = "carrotsearch-randomizedtesting" }
-# @keep transitive dependency for version alignment
+# @keep transitive depenxdency for version alignment
 checkerframework-qual = { module = "org.checkerframework:checker-qual", version.ref = "checkerframework" }
 codehaus-woodstox-stax2api = { module = "org.codehaus.woodstox:stax2-api", version.ref = "codehaus-woodstox" }
 commonscli-commonscli = { module = "commons-cli:commons-cli", version.ref = "commons-cli" }
@@ -305,7 +306,8 @@ commonsio-commonsio = { module = "commons-io:commons-io", version.ref = "commons
 cybozulabs-langdetect = { module = "com.cybozu.labs:langdetect", version.ref = "cybozulabs-langdetect" }
 dropwizard-metrics-core = { module = "io.dropwizard.metrics:metrics-core", version.ref = "dropwizard-metrics" }
 dropwizard-metrics-graphite = { module = "io.dropwizard.metrics:metrics-graphite", version.ref = "dropwizard-metrics" }
-dropwizard-metrics-jetty10 = { module = "io.dropwizard.metrics:metrics-jetty10", version.ref = "dropwizard-metrics" }
+dropwizard-metrics-jetty12 = { module = "io.dropwizard.metrics:metrics-jetty12", version.ref = "dropwizard-metrics" }
+dropwizard-metrics-jetty12-ee10 = { module = "io.dropwizard.metrics:metrics-jetty12-ee10", version.ref = "dropwizard-metrics" }
 dropwizard-metrics-jmx = { module = "io.dropwizard.metrics:metrics-jmx", version.ref = "dropwizard-metrics" }
 dropwizard-metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version.ref = "dropwizard-metrics" }
 dropwizard-metrics-servlets = { module = "io.dropwizard.metrics:metrics-servlets", version.ref = "dropwizard-metrics" }
@@ -315,23 +317,29 @@ eclipse-jetty-alpnjavaserver = { module = "org.eclipse.jetty:jetty-alpn-java-ser
 eclipse-jetty-alpnserver = { module = "org.eclipse.jetty:jetty-alpn-server", version.ref = "eclipse-jetty" }
 eclipse-jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "eclipse-jetty" }
 eclipse-jetty-deploy = { module = "org.eclipse.jetty:jetty-deploy", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee = { module = "org.eclipse.jetty:jetty-ee", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee10-webapp = { module = "org.eclipse.jetty.ee10:jetty-ee10-webapp", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee8-nested = { module = "org.eclipse.jetty.ee8:jetty-ee8-nested", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee8-servlet = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlet", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee8-servlets = { module = "org.eclipse.jetty.ee8:jetty-ee8-servlets", version.ref = "eclipse-jetty" }
+eclipse-jetty-ee8-webapp = { module = "org.eclipse.jetty.ee8:jetty-ee8-webapp", version.ref = "eclipse-jetty" }
 eclipse-jetty-http = { module = "org.eclipse.jetty:jetty-http", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:http2-client", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:http2-common", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:http2-hpack", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:http2-http-client-transport", version.ref = "eclipse-jetty" }
-eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:http2-server", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-client = { module = "org.eclipse.jetty.http2:jetty-http2-client", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-common = { module = "org.eclipse.jetty.http2:jetty-http2-common", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-hpack = { module = "org.eclipse.jetty.http2:jetty-http2-hpack", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-httpclienttransport = { module = "org.eclipse.jetty.http2:jetty-http2-client-transport", version.ref = "eclipse-jetty" }
+eclipse-jetty-http2-server = { module = "org.eclipse.jetty.http2:jetty-http2-server", version.ref = "eclipse-jetty" }
 eclipse-jetty-io = { module = "org.eclipse.jetty:jetty-io", version.ref = "eclipse-jetty" }
 eclipse-jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref = "eclipse-jetty" }
+eclipse-jetty-jndi = { module = "org.eclipse.jetty:jetty-jndi", version.ref = "eclipse-jetty" }
+eclipse-jetty-plus = { module = "org.eclipse.jetty:jetty-plus", version.ref = "eclipse-jetty" }
 eclipse-jetty-rewrite = { module = "org.eclipse.jetty:jetty-rewrite", version.ref = "eclipse-jetty" }
 eclipse-jetty-security = { module = "org.eclipse.jetty:jetty-security", version.ref = "eclipse-jetty" }
 eclipse-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "eclipse-jetty" }
-eclipse-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "eclipse-jetty" }
-eclipse-jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "eclipse-jetty" }
+eclipse-jetty-session = { module = "org.eclipse.jetty:jetty-session", version.ref = "eclipse-jetty" }
 eclipse-jetty-start = { module = "org.eclipse.jetty:jetty-start", version.ref = "eclipse-jetty" }
 eclipse-jetty-toolchain-servletapi = { module = "org.eclipse.jetty.toolchain:jetty-servlet-api", version.ref = "eclipse-jettytoolchain" }
 eclipse-jetty-util = { module = "org.eclipse.jetty:jetty-util", version.ref = "eclipse-jetty" }
-eclipse-jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp", version.ref = "eclipse-jetty" }
 eclipse-jetty-xml = { module = "org.eclipse.jetty:jetty-xml", version.ref = "eclipse-jetty" }
 eclipse-jgit-jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "eclipse-jgit" }
 fasterxml-jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "fasterxml" }

gradle/testing/randomization/policies/solr-tests.policy

@@ -158,6 +158,7 @@ grant {
 
   // needed by s3mock
   permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.fs";
+  permission java.lang.RuntimePermission "accessSystemModules";
 
   // needed for kafka mockito
   permission java.lang.RuntimePermission "manageProcess";
@@ -252,8 +253,15 @@ grant {
   permission java.io.FilePermission "${aws.configFile}", "read,readlink";
   permission java.io.FilePermission "${user.home}${/}.aws${/}-", "read,readlink";
 
+  // GCS
+  permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}properties", "read,readlink";
+  permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}active_config", "read,readlink";
+  permission java.io.FilePermission "${user.home}${/}.config${/}gcloud${/}configurations${/}config_default", "read,readlink";
+
+
   // expanded to a wildcard if set, allows all networking everywhere
   permission java.net.SocketPermission "${solr.internal.network.permission}", "accept,listen,connect,resolve";
+  permission java.net.SocketPermission "metadata.google.internal:80", "connect,resolve";
 
   // Run java
   permission java.io.FilePermission "${java.home}${/}-", "execute";

solr/core/build.gradle

@@ -194,7 +194,8 @@ dependencies {
   testImplementation libs.apache.lucene.testframework
 
   testImplementation libs.eclipse.jetty.server
-  testImplementation libs.eclipse.jetty.servlet
+  testImplementation libs.eclipse.jetty.ee8.servlet
+  testImplementation libs.eclipse.jetty.util
 
   testImplementation libs.carrotsearch.randomizedtesting.runner
   testImplementation libs.junit.junit

solr/core/src/java/org/apache/solr/api/V2HttpCall.java

@@ -434,7 +434,12 @@ protected void executeCoreRequest(SolrQueryResponse rsp) {
         // SolrCore counter
         core.close();
         core = null;
-        response.getHeaderNames().stream().forEach(name -> response.setHeader(name, null));
+        // Skip specific headers
+        // workaround for response.setHeader(name, null)
+        response.getHeaderNames().stream()
+            .filter(name -> !name.equalsIgnoreCase("Content-Length"))
+            .forEach(name -> response.setHeader(name, ""));
+        response.setContentLength(-1);
         invokeJerseyRequest(
             cores, null, cores.getJerseyApplicationHandler(), cores.getRequestHandlers(), rsp);
       }

solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java

@@ -100,9 +100,14 @@ public class ShowFileRequestHandler extends RequestHandlerBase implements Permis
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   static {
-    KNOWN_MIME_TYPES = new HashSet<>(MimeTypes.getKnownMimeTypes());
+    KNOWN_MIME_TYPES = new HashSet<>();
+    for (MimeTypes.Type type : MimeTypes.Type.values()) {
+      KNOWN_MIME_TYPES.add(type.toString());
+    }
     KNOWN_MIME_TYPES.add("text/xml");
     KNOWN_MIME_TYPES.add("text/javascript");
+    KNOWN_MIME_TYPES.add("text/csv");
+    KNOWN_MIME_TYPES.add("application/xhtml+xml");
   }
 
   public ShowFileRequestHandler() {

solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java

@@ -31,7 +31,7 @@
 import org.apache.http.protocol.HttpContext;
 import org.apache.solr.core.SolrInfoBean;
 import org.apache.solr.metrics.SolrMetricsContext;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 
 /**
  * @lucene.experimental

solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java

@@ -47,7 +47,7 @@
 import org.apache.solr.common.SpecProvider;
 import org.apache.solr.common.util.CommandOperation;
 import org.apache.solr.common.util.ValidatingJsonMap;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -247,7 +247,8 @@ protected boolean interceptInternodeRequest(Request request) {
                 .encodeToString(
                     (principal.getName() + ":" + principal.getPassword())
                         .getBytes(StandardCharsets.UTF_8));
-        request.header(HttpHeaders.AUTHORIZATION, "Basic " + userPassBase64);
+        request.headers(
+            httpFields -> httpFields.add(HttpHeaders.AUTHORIZATION, "Basic " + userPassBase64));
         return true;
       }
     }

solr/core/src/java/org/apache/solr/security/MultiAuthPlugin.java

@@ -42,7 +42,7 @@
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.admin.api.ModifyMultiPluginAuthConfigAPI;
 import org.apache.solr.metrics.SolrMetricsContext;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 
 /**
  * Authentication plugin that supports multiple Authorization schemes, such as Bearer and Basic. The

solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java

@@ -57,7 +57,7 @@
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.request.SolrRequestInfo;
 import org.apache.solr.util.CryptoKeys;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -414,11 +414,12 @@ public void onBegin(Request request) {
             if ("v1".equals(System.getProperty(SEND_VERSION))) {
               preFetchedUser
                   .map(PKIAuthenticationPlugin.this::generateToken)
-                  .ifPresent(token -> request.header(HEADER, token));
+                  .ifPresent(token -> request.headers(httpFields -> httpFields.add(HEADER, token)));
             } else {
               preFetchedUser
                   .map(PKIAuthenticationPlugin.this::generateTokenV2)
-                  .ifPresent(token -> request.header(HEADER_V2, token));
+                  .ifPresent(
+                      token -> request.headers(httpFields -> httpFields.add(HEADER_V2, token)));
             }
           }
 

solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java

@@ -431,7 +431,7 @@ public String toString() {
     // care when assembling the final response to check both the rollup and leader trackers on the
     // aggregator node.
     public void trackRequestResult(
-        org.eclipse.jetty.client.api.Response resp, InputStream respBody, boolean success) {
+        org.eclipse.jetty.client.Response resp, InputStream respBody, boolean success) {
 
       // Returning Integer.MAX_VALUE here means there was no "rf" on the response, therefore we just
       // need to increment our achieved rf if we are a leader, i.e. have a leaderTracker.

solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java

@@ -32,7 +32,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.StrUtils;
 import org.apache.solr.update.SolrCmdDistributor.SolrError;
-import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

solr/core/src/java/org/apache/solr/util/stats/InstrumentedHttpListenerFactory.java

@@ -29,8 +29,8 @@
 import org.apache.solr.metrics.SolrMetricProducer;
 import org.apache.solr.metrics.SolrMetricsContext;
 import org.apache.solr.util.tracing.TraceUtils;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Result;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.Result;
 
 /**
  * A HttpListenerFactory tracking metrics and distributed tracing. The Metrics are inspired and

solr/core/src/java/org/apache/solr/util/tracing/TraceUtils.java

@@ -32,7 +32,7 @@
 import javax.servlet.http.HttpServletRequest;
 import org.apache.http.HttpRequest;
 import org.apache.solr.request.SolrQueryRequest;
-import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.Request;
 
 /** Utilities for distributed tracing. */
 public class TraceUtils {

solr/core/src/test/org/apache/solr/cli/PackageToolTest.java

@@ -35,8 +35,8 @@
 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.HandlerList;
 import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.eclipse.jetty.util.resource.PathResourceFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -402,13 +402,13 @@ public void start() throws Exception {
       server.setStopAtShutdown(true);
 
       ResourceHandler resourceHandler = new ResourceHandler();
-      resourceHandler.setResourceBase(resourceDir);
-      resourceHandler.setDirectoriesListed(true);
+      resourceHandler.setBaseResource(new PathResourceFactory().newResource(resourceDir));
 
-      HandlerList handlers = new HandlerList();
-      handlers.setHandlers(new Handler[] {resourceHandler, new DefaultHandler()});
-      server.setHandler(handlers);
+      Handler.Sequence sequence = new Handler.Sequence();
+      sequence.addHandler(resourceHandler);
+      sequence.addHandler(new DefaultHandler());
 
+      server.setHandler(sequence);
       server.start();
     }
 

solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java

@@ -53,7 +53,7 @@
 import org.apache.solr.util.RestTestBase;
 import org.apache.solr.util.RestTestHarness;
 import org.apache.solr.util.TimeOut;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.noggit.JSONParser;

solr/core/src/test/org/apache/solr/request/TestStreamBody.java

@@ -26,7 +26,7 @@
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Test;
 import org.slf4j.Logger;

solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java

@@ -21,7 +21,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.BeforeClass;
 
 /**

solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java

@@ -19,7 +19,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java

@@ -23,7 +23,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.solr.common.util.Utils;
 import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java

@@ -29,7 +29,7 @@
 import java.util.TreeMap;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymGraphFilterFactory.java

@@ -31,7 +31,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.file.PathUtils;
 import org.apache.solr.util.RestTestBase;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java

@@ -30,7 +30,7 @@
 import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.util.BaseTestHarness;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee8.servlet.ServletHolder;
 import org.junit.After;
 import org.junit.Test;
 import org.slf4j.Logger;