Bump up Java version to 21 (#2682)

iamsanjay · dsmiley · web-flow · commit d840a3bef651 · 2024-10-24T08:03:29.000+05:30
* The minimum Java version for the main branch is 21, except for the SolrJ main package, which requires version 17.

---------

Co-authored-by: David Smiley &lt;dsmiley@apache.org&gt;
diff --git a/.github/workflows/bin-solr-test.yml b/.github/workflows/bin-solr-test.yml
@@ -24,11 +24,11 @@ jobs:
     steps:
     # Setup
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 21
         java-package: jdk
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml
@@ -26,11 +26,11 @@ jobs:
     steps:
     # Setup
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 21
         java-package: jdk
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/gradle-precommit.yml b/.github/workflows/gradle-precommit.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   test:
-    name: gradle check w/ Java 11
+    name: gradle check
 
     runs-on: ubuntu-latest
 
@@ -19,11 +19,11 @@ jobs:
     # Setup
     - uses: actions/checkout@v4
 
-    - name: Set up JDK 11
+    - name: Set up JDK
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 21
         java-package: jdk
 
     - name: Setup Gradle
diff --git a/.github/workflows/solrj-test.yml b/.github/workflows/solrj-test.yml
@@ -21,11 +21,11 @@ jobs:
     steps:
     # Setup
     - uses: actions/checkout@v4
-    - name: Set up JDK 11
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: 11
+        java-version: 21
         java-package: jdk
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4
diff --git a/build-tools/scriptDepVersions.gradle b/build-tools/scriptDepVersions.gradle
@@ -21,10 +21,11 @@
 
 ext {
   scriptDepVersions = [
-      "min-java-version": "11",
+      "min-java-version": "21",
+      "min-solrj-java-version" : "17",
       "apache-rat": "0.15",
       "commons-codec": "1.16.0",
-      "ecj": "3.33.0",
+      "ecj": "3.36.0",
       "javacc": "7.0.12",
       "jgit": "6.7.0.202309050840-r",
       "flexmark": "0.64.8",
diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,7 @@ apply from: file('build-tools/scriptDepVersions.gradle')
 
 // Declare default Java versions for the entire project and for SolrJ separately
 rootProject.ext.minJavaVersionDefault = JavaVersion.toVersion(scriptDepVersions['min-java-version'])
-rootProject.ext.minJavaVersionSolrJ = JavaVersion.toVersion(scriptDepVersions['min-java-version'])
+rootProject.ext.minJavaVersionSolrJ = JavaVersion.toVersion(scriptDepVersions['min-solrj-java-version'])
 
 apply from: file('gradle/globals.gradle')
 
diff --git a/crave.yaml b/crave.yaml
@@ -0,0 +1,2 @@
+Solr:
+  image: "accupara/openjdk:21"
diff --git a/dev-docs/solr-source-code.adoc b/dev-docs/solr-source-code.adoc
@@ -2,10 +2,10 @@
 
 ## Building Solr from Source
 
-Download the Java 11 JDK (Java Development Kit) or later.
+Download the Java 21 JDK (Java Development Kit) or later.
 We recommend the OpenJDK distribution Eclipse Temurin available from https://adoptium.net/.
 You will need the JDK installed, and the $JAVA_HOME/bin (Windows: %JAVA_HOME%\bin) folder included on your command path.
-To test this, issue a "java -version" command from your shell (command prompt) and verify that the Java version is 11 or later.
+To test this, issue a "java -version" command from your shell (command prompt) and verify that the Java version is 21 or later.
 See the xref:jvms.adoc[JVM developer doc] for more information on Gradle and JVMs.
 
 Clone the latest Apache Solr source code directly from the Git repository: <https://solr.apache.org/community.html#version-control>.
diff --git a/gradle/globals.gradle b/gradle/globals.gradle
@@ -173,5 +173,6 @@ allprojects {
     // Assign different java version for client-side modules 'api' and 'solrj*'
     var isSolrJ = project.name.matches("^(solrj.*|api)\$")
     minJavaVersion = isSolrJ ? rootProject.minJavaVersionSolrJ : rootProject.minJavaVersionDefault
+    minJavaTestVersion = rootProject.minJavaVersionDefault
   }
 }
diff --git a/gradle/java/javac.gradle b/gradle/java/javac.gradle
@@ -19,14 +19,19 @@
 
 allprojects {
   plugins.withType(JavaPlugin) {
-    sourceCompatibility = project.minJavaVersion
-    targetCompatibility = project.minJavaVersion
-
-    // Use 'release' flag instead of 'source' and 'target'
-    tasks.withType(JavaCompile) {
-      options.compilerArgs += ["--release", project.minJavaVersion.toString()]
-    }
-
+      // Use 'release' flag instead of 'source' and 'target'
+      tasks.withType(JavaCompile) {
+        compileTestJava {
+          sourceCompatibility = project.minJavaTestVersion
+          targetCompatibility = project.minJavaTestVersion
+          options.compilerArgs += ["--release", project.minJavaTestVersion.toString()]
+        }
+        compileJava {
+          sourceCompatibility = project.minJavaVersion
+          targetCompatibility = project.minJavaVersion
+          options.compilerArgs += ["--release", project.minJavaVersion.toString()]
+        }
+      }
     // Configure warnings.
     tasks.withType(JavaCompile) {
       options.encoding = "UTF-8"
@@ -51,22 +56,12 @@ allprojects {
         "-Xdoclint:all/protected",
         "-Xdoclint:-missing",
         "-Xdoclint:-accessibility",
+        "-Xlint:synchronization",
+        "-Xlint:text-blocks",
         "-proc:none",  // proc:none was added because of LOG4J2-1925 / JDK-8186647
+        "-Xlint:removal"
       ]
 
-      // enable some warnings only relevant to newer language features
-      if (rootProject.runtimeJavaVersion >= JavaVersion.VERSION_15) {
-        options.compilerArgs += [
-          "-Xlint:text-blocks",
-        ]
-      }
-
-      if (rootProject.runtimeJavaVersion >= JavaVersion.VERSION_16) {
-        options.compilerArgs += [
-          "-Xlint:synchronization",
-        ]
-      }
-
       if (propertyOrDefault("javac.failOnWarnings", true).toBoolean()) {
         options.compilerArgs += "-Werror"
       }
diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradle
@@ -111,12 +111,6 @@ allprojects {
       ignoreFailures = resolvedTestOption("tests.haltonfailure").toBoolean() == false
 
       jvmArgs Commandline.translateCommandline(resolvedTestOption("tests.jvmargs"))
-      
-      // Up to JDK-15 we have to enforce --illegal-access=deny, because we want no code to access
-      // JDK internals; JDK-16 and later will default to deny, see https://openjdk.java.net/jeps/396:
-      if (rootProject.runtimeJavaVersion < JavaVersion.VERSION_16) {
-        jvmArgs '--illegal-access=deny'
-      }
 
       def loggingConfigFile = layout.projectDirectory.file("${resources}/logging.properties")
       def tempDir = layout.projectDirectory.dir(testsTmpDir.toString())
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
@@ -108,6 +108,8 @@ Other Changes
 
 * SOLR-17285: SolrJ RemoteSolrException moved to SolrClient. (@samuelrivascoding)
 
+* SOLR-17321: Minimum Java version for Apache Solr is now 21, and for SolrJ, it is 17. (Sanjay Dutt, David Smiley)
+
 ==================  9.8.0 ==================
 New Features
 ---------------------
diff --git a/solr/benchmark/jmh.sh b/solr/benchmark/jmh.sh
@@ -51,9 +51,7 @@ echo "running JMH with args: $@"
 # -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=20  # and this note: Prevents G1 undermining young gen, which otherwise causes a cascade of issues
 #                                                            MRM: I've also seen 15 claimed as a sweet spot.
 
-# -XX:-UseBiasedLocking - should be unreflective in recent JVMs and removed in the latest.
-
-jvmArgs="-jvmArgs -Djmh.shutdownTimeout=5 -jvmArgs -Djmh.shutdownTimeout.step=3 -jvmArgs -Djava.security.egd=file:/dev/./urandom  -jvmArgs -XX:-UseBiasedLocking -jvmArgs -XX:+UnlockDiagnosticVMOptions -jvmArgs -XX:+DebugNonSafepoints -jvmArgs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
+jvmArgs="-jvmArgs -Djmh.shutdownTimeout=5 -jvmArgs -Djmh.shutdownTimeout.step=3 -jvmArgs -Djava.security.egd=file:/dev/./urandom -jvmArgs -XX:+UnlockDiagnosticVMOptions -jvmArgs -XX:+DebugNonSafepoints -jvmArgs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED"
 gcArgs="-jvmArgs -XX:+UseG1GC -jvmArgs -XX:+ParallelRefProcEnabled"
 
 # -jvmArgs -Dlog4j2.debug 
diff --git a/solr/bin/solr b/solr/bin/solr
@@ -51,7 +51,7 @@ verbose=false
 THIS_OS=$(uname -s)
 
 # What version of Java is required to run this version of Solr.
-JAVA_VER_REQ=11
+JAVA_VER_REQ=21
 
 stop_all=false
 
@@ -1322,18 +1322,9 @@ function start_solr() {
     exit 1
   fi
 
-  # Workaround for JIT crash, see https://issues.apache.org/jira/browse/SOLR-16463
-  if [[ "$JAVA_VER_NUM" -ge "17" ]] ; then
-    SCRIPT_SOLR_OPTS+=("-XX:CompileCommand=exclude,com.github.benmanes.caffeine.cache.BoundedLocalCache::put")
-    echo "Java $JAVA_VER_NUM detected. Enabled workaround for SOLR-16463"
-  fi
-
   # Vector optimizations are only supported for Java 20 and 21 for now.
   # This will need to change as Lucene is upgraded and newer Java versions are released
-  if [[ "$JAVA_VER_NUM" -ge "20" ]] && [[ "$JAVA_VER_NUM" -le "21" ]] ; then
-    SCRIPT_SOLR_OPTS+=("--add-modules" "jdk.incubator.vector")
-    echo "Java $JAVA_VER_NUM detected. Incubating Panama Vector APIs have been enabled"
-  fi
+  SCRIPT_SOLR_OPTS+=("--add-modules" "jdk.incubator.vector")
 
   SOLR_START_OPTS=('-server' "${JAVA_MEM_OPTS[@]}" "${GC_TUNE_ARR[@]}" "${GC_LOG_OPTS[@]}" "${IP_ACL_OPTS[@]}" \
     "${REMOTE_JMX_OPTS[@]}" "${CLOUD_MODE_OPTS[@]}" -Dsolr.log.dir="$SOLR_LOGS_DIR" \
diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmd
@@ -49,15 +49,8 @@ REM set GC_TUNE=-XX:+ExplicitGCInvokesConcurrent
 REM set GC_TUNE=-XX:SurvivorRatio=4
 REM set GC_TUNE=%GC_TUNE% -XX:TargetSurvivorRatio=90
 REM set GC_TUNE=%GC_TUNE% -XX:MaxTenuringThreshold=8
-REM set GC_TUNE=%GC_TUNE% -XX:+UseConcMarkSweepGC
-REM set GC_TUNE=%GC_TUNE% -XX:ConcGCThreads=4
 REM set GC_TUNE=%GC_TUNE% -XX:ParallelGCThreads=4
-REM set GC_TUNE=%GC_TUNE% -XX:+CMSScavengeBeforeRemark
 REM set GC_TUNE=%GC_TUNE% -XX:PretenureSizeThreshold=64m
-REM set GC_TUNE=%GC_TUNE% -XX:+UseCMSInitiatingOccupancyOnly
-REM set GC_TUNE=%GC_TUNE% -XX:CMSInitiatingOccupancyFraction=50
-REM set GC_TUNE=%GC_TUNE% -XX:CMSMaxAbortablePrecleanTime=6000
-REM set GC_TUNE=%GC_TUNE% -XX:+CMSParallelRemarkEnabled
 REM set GC_TUNE=%GC_TUNE% -XX:+ParallelRefProcEnabled      etc.
 
 REM Set the ZooKeeper connection string if using an external ZooKeeper ensemble
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
@@ -55,14 +55,8 @@
 #-XX:SurvivorRatio=4 \
 #-XX:TargetSurvivorRatio=90 \
 #-XX:MaxTenuringThreshold=8 \
-#-XX:+UseConcMarkSweepGC \
-#-XX:ConcGCThreads=4 -XX:ParallelGCThreads=4 \
-#-XX:+CMSScavengeBeforeRemark \
+#-XX:ParallelGCThreads=4 \
 #-XX:PretenureSizeThreshold=64m \
-#-XX:+UseCMSInitiatingOccupancyOnly \
-#-XX:CMSInitiatingOccupancyFraction=50 \
-#-XX:CMSMaxAbortablePrecleanTime=6000 \
-#-XX:+CMSParallelRemarkEnabled \
 #-XX:+ParallelRefProcEnabled        etc.
 
 # Set the ZooKeeper connection string if using an external ZooKeeper ensemble
@@ -279,7 +273,7 @@
 # other directory, which will implicitly enable heap dumping. Dump name pattern will be solr-[timestamp]-pid[###].hprof
 # When using this feature, it is recommended to have an external service monitoring the given dir.
 # If more fine grained control is required, you can manually add the appropriate flags to SOLR_OPTS
-# See https://docs.oracle.com/en/java/javase/11/troubleshoot/command-line-options1.html
+# See https://docs.oracle.com/en/java/javase/21/troubleshoot/command-line-options1.html
 # You can test this behavior by setting SOLR_HEAP=25m
 #SOLR_HEAP_DUMP=true
 #SOLR_HEAP_DUMP_DIR=/var/log/dumps
diff --git a/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
@@ -187,7 +187,7 @@ public ValueSource parse(FunctionQParser fp) throws SyntaxError {
         new ValueSourceParser() {
           @Override
           public ValueSource parse(FunctionQParser fp) throws SyntaxError {
-            return new LongConstValueSource(Thread.currentThread().getId());
+            return new LongConstValueSource(Thread.currentThread().threadId());
           }
         });
     addParser(
diff --git a/solr/core/src/test/org/apache/solr/cli/AssertToolTest.java b/solr/core/src/test/org/apache/solr/cli/AssertToolTest.java
@@ -26,6 +26,7 @@
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
 import org.apache.solr.cloud.SolrCloudTestCase;
 import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.util.SuppressForbidden;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -37,6 +38,8 @@ public static void setupCluster() throws Exception {
   }
 
   @Test
+  @SuppressWarnings("removal")
+  @SuppressForbidden(reason = "Deprecated, for removal in future Java version")
   public void raisesExitCode100OnError() throws Exception {
     assumeTrue(
         "This test only works with security manager, as it raises an error accessing /tmp",
diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java b/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java
@@ -89,7 +89,7 @@ public void testCompareWithNullLast() {
     assertEquals(a.compareTo(b), PivotFacetFieldValueCollection.compareWithNullLast(a, b));
     assertEquals(b.compareTo(a), PivotFacetFieldValueCollection.compareWithNullLast(b, a));
 
-    Long bb = new Long(b.longValue());
+    Long bb = Long.valueOf(b.longValue());
     assertEquals(0, PivotFacetFieldValueCollection.compareWithNullLast(b, bb));
 
     assertEquals(0, PivotFacetFieldValueCollection.compareWithNullLast(null, null));
diff --git a/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java b/solr/core/src/test/org/apache/solr/legacy/TestLegacyNumericUtils.java
@@ -266,7 +266,7 @@ public void testFloats() {
         new float[] {
           Float.NEGATIVE_INFINITY,
           -2.3E25f,
-          -9.9999999E+14f,
+          -1.0E+15f,
           -1.0f,
           -1.0E-1f,
           -1.0E-2f,
@@ -275,7 +275,7 @@ public void testFloats() {
           1.0E-2f,
           1.0E-1f,
           1.0f,
-          9.9999999E+14f,
+          1.0E+15f,
           2.3E25f,
           Float.POSITIVE_INFINITY,
           Float.NaN
diff --git a/solr/docker/build.gradle b/solr/docker/build.gradle
@@ -22,7 +22,7 @@ import org.apache.commons.codec.digest.DigestUtils
 description = 'Solr Docker image'
 
 apply plugin: 'base'
-
+def javaVersion = scriptDepVersions['min-java-version']
 // Solr Docker inputs
 def dockerImageSolrDist = "${ -> propertyOrEnvOrDefault("solr.docker.dist", "SOLR_DOCKER_DIST", 'full') }"
 def isDistSlim = {String dist -> dist.toLowerCase(Locale.ROOT) == "slim"}
@@ -33,7 +33,7 @@ def dockerImageTagSuffix = "${ -> propertyOrEnvOrDefault("solr.docker.imageTagSu
 def dockerImageRepo = "${ -> propertyOrEnvOrDefault("solr.docker.imageRepo", "SOLR_DOCKER_IMAGE_REPO", "apache/solr") }"
 def dockerImageTag = "${ -> propertyOrEnvOrDefault("solr.docker.imageTag", "SOLR_DOCKER_IMAGE_TAG", project.version + dockerImageDistSuffix) }"
 def dockerImageName = "${ -> propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}:${dockerImageTag}${dockerImageTagSuffix}") }"
-def baseDockerImage = "${ -> propertyOrEnvOrDefault("solr.docker.baseImage", "SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:17-jre-jammy') }"
+def baseDockerImage = "${ -> propertyOrEnvOrDefault("solr.docker.baseImage", "SOLR_DOCKER_BASE_IMAGE", 'eclipse-temurin:' + javaVersion + '-jre-jammy') }"
 def officialDockerImageName = {String dist -> "${ -> propertyOrEnvOrDefault("solr.docker.imageName", "SOLR_DOCKER_IMAGE_NAME", "${dockerImageRepo}-official:${dockerImageTag}${distToSuffix(dist)}${dockerImageTagSuffix}") }" }
 
 def releaseGpgFingerprint = "${ -> propertyOrDefault('signing.gnupg.keyName',propertyOrDefault('signing.keyId','')) }"
diff --git a/solr/modules/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java b/solr/modules/scripting/src/java/org/apache/solr/scripting/update/ScriptUpdateProcessorFactory.java
diff --git a/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java b/solr/modules/scripting/src/test/org/apache/solr/scripting/update/ScriptUpdateProcessorFactoryTest.java
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/system-requirements.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/system-requirements.adoc
diff --git a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc
diff --git a/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc b/solr/solr-ref-guide/modules/upgrade-notes/pages/major-changes-in-solr-10.adoc
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SolrNamedThreadFactory.java b/solr/solrj/src/java/org/apache/solr/common/util/SolrNamedThreadFactory.java

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Solr:`
	`2`	`+ image: "accupara/openjdk:21"`
Original file line number	Diff line number	Diff line change
`@@ -173,5 +173,6 @@ allprojects {`
`173`	`173`	`// Assign different java version for client-side modules 'api' and 'solrj*'`
`174`	`174`	`var isSolrJ = project.name.matches("^(solrj.*\|api)\$")`
`175`	`175`	`minJavaVersion = isSolrJ ? rootProject.minJavaVersionSolrJ : rootProject.minJavaVersionDefault`
	`176`	`+ minJavaTestVersion = rootProject.minJavaVersionDefault`
`176`	`177`	`}`
`177`	`178`	`}`