WIP JDK 20

.github/workflows/bin-solr-test.yml

@@ -17,12 +17,12 @@ jobs:
 
     steps:
     # Setup
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - name: Set up JDK 20
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 20
         java-package: jdk
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

.github/workflows/docker-test.yml

@@ -23,12 +23,12 @@ jobs:
 
     steps:
     # Setup
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - name: Set up JDK 20
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 20
         java-package: jdk
     - name: Install ACL
       run: sudo apt-get install acl

.github/workflows/gradle-precommit.yml

@@ -7,19 +7,19 @@ on:
 
 jobs:
   test:
-    name: gradle precommit w/ Java 11
+    name: gradle precommit w/ Java 20
 
     runs-on: ubuntu-latest
 
     steps:
     # Setup
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - name: Set up JDK 20
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 20
         java-package: jdk
 
     - name: Grant execute permission for gradlew

.github/workflows/solrj-test.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
     # Setup
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - name: Set up JDK 20
+      uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 20
         java-package: jdk
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

solr/core/src/test/org/apache/solr/cloud/PackageManagerCLITest.java

@@ -18,6 +18,7 @@
 package org.apache.solr.cloud;
 
 import java.lang.invoke.MethodHandles;
+import java.nio.file.Path;
 import java.util.Arrays;
 import org.apache.solr.cli.PackageTool;
 import org.apache.solr.cli.SolrCLI;
@@ -30,6 +31,7 @@
 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.Resource;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -242,7 +244,10 @@ public void start() throws Exception {
       server.setStopAtShutdown(true);
 
       ResourceHandler resourceHandler = new ResourceHandler();
-      resourceHandler.setResourceBase(resourceDir);
+
+      // Using just setResourceBase(".") means that Jetty calls toRealPath with NO_FOLLOW_LINKS
+      // in PathResource line 226. This invocation bypasses that check by using a URI instead.
+      resourceHandler.setBaseResource(Resource.newResource(Path.of(resourceDir).toRealPath().toUri()));
       resourceHandler.setDirectoriesListed(true);
 
       HandlerList handlers = new HandlerList();

solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java

@@ -19,6 +19,7 @@
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.file.Path;
 import java.util.Locale;
 import java.util.Random;
 import org.apache.http.Header;
@@ -35,6 +36,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.session.DefaultSessionIdManager;
+import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.WebAppContext;
 
 /**
@@ -62,7 +64,9 @@ public void setUp() throws Exception {
     // insecure: only use for tests!!!!
     server.setSessionIdManager(
         new DefaultSessionIdManager(server, new Random(random().nextLong())));
-    new WebAppContext(server, path, "/solr");
+    // Using just WebAppContext with path means that Jetty calls toRealPath with NO_FOLLOW_LINKS
+    // in PathResource line 226. This invocation bypasses that check by using a URI instead.
+    new WebAppContext(server, Resource.newResource(Path.of(path).toRealPath().toUri()), "/solr");
 
     ServerConnector connector = new ServerConnector(server, new HttpConnectionFactory());
     connector.setIdleTimeout(1000 * 60 * 60);

solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java

@@ -94,6 +94,7 @@
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.servlet.Source;
 import org.eclipse.jetty.util.component.LifeCycle;
+import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.eclipse.jetty.util.thread.ReservedThreadExecutor;
@@ -373,7 +374,13 @@ private void init(int port) {
       // Initialize the servlets
       final ServletContextHandler root =
           new ServletContextHandler(server, "/solr", ServletContextHandler.SESSIONS);
-      root.setResourceBase(".");
+      try {
+        // Using just setResourceBase(".") means that Jetty calls toRealPath with NO_FOLLOW_LINKS
+        // in PathResource line 226. This invocation bypasses that check by using a URI instead.
+        root.setBaseResource(Resource.newResource(Path.of(".").toRealPath().toUri()));
+      } catch (IOException e) {
+        throw new RuntimeException("Unable to set Jetty resource base", e);
+      }
 
       server.addEventListener(
           new LifeCycle.Listener() {