commit 98025a65ac1ea61473f6035ab827b9d71b662b1e
author David Ostrovsky <david@ostrovsky.org> Mon Apr 24 22:01:26 2023 +0200
committer David Ostrovsky <david@ostrovsky.org> Fri Apr 28 06:55:21 2023 +0200
tree 0c77898fddb5346303679472fb90d2e9db5b76a5
parent 6613c990a5514b57163ea3f7b0156b2edfb1f395

Raise minimum java version check

Minimum supported java version was raised to Java 11 since release 3.5.
Since change Ibf02de099ce the minimum Java version 11.0.10 is required.

Upgrade the minimum Java version check correspondingly.

Release-Notes: Check minimum required Java version to be 11.0.10.
Change-Id: Ibcbc6abe452243023578d3b5aafed61be4614799

java/Main.java

diff --git a/java/Main.java b/java/Main.java
index 09c8c76..c04db2c 100644
--- a/java/Main.java
+++ b/java/Main.java
@@ -16,6 +16,7 @@
 public final class Main {
   private static final String FLOGGER_BACKEND_PROPERTY = "flogger.backend_factory";
   private static final String FLOGGER_LOGGING_CONTEXT = "flogger.logging_context";
+  private static final Runtime.Version MIN_JAVA_VERSION = Runtime.Version.parse("11.0.10");
 
   // We don't do any real work here because we need to import
   // the archive lookup code and we cannot import a class in
@@ -34,11 +35,11 @@
   }
 
   private static boolean onSupportedJavaVersion() {
-    final String version = System.getProperty("java.specification.version");
-    if (1.8 <= parse(version)) {
+    Runtime.Version version = Runtime.version();
+    if (version.compareTo(MIN_JAVA_VERSION) >= 0) {
       return true;
     }
-    System.err.println("fatal: Gerrit Code Review requires Java 8 or later");
+    System.err.println("fatal: Gerrit Code Review requires Java " + MIN_JAVA_VERSION + " or later");
     System.err.println("       (trying to run on Java " + version + ")");
     return false;
   }
@@ -58,22 +59,5 @@
         "com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance");
   }
 
-  private static double parse(String version) {
-    if (version == null || version.length() == 0) {
-      return 0.0;
-    }
-
-    try {
-      final int fd = version.indexOf('.');
-      final int sd = version.indexOf('.', fd + 1);
-      if (0 < sd) {
-        version = version.substring(0, sd);
-      }
-      return Double.parseDouble(version);
-    } catch (NumberFormatException e) {
-      return 0.0;
-    }
-  }
-
   private Main() {}
 }