Changeset 47629bf for apps

Timestamp:

Dec 24, 2018 1:24:58 PM (2 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

0fdede8

Parents:

0474876

Message:

Console: Update ARM warning (ticket #2368), remove Java 11 warning

File:

• apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java (modified) (2 diffs)

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -344 +344 @@
         boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
                             !FileUtil.isPack200Supported();
-        boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK();
-        boolean isJava11 = SystemVersion.isJava11();
+        boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK() && !SystemVersion.isJava9();
+        boolean isJava11 = false; // SystemVersion.isJava11();
         if (noJava7 || noPack200 || openARM || isJava11) {
             String s = "Java version: " + System.getProperty("java.version") +
@@ -365 +365 @@
             }
             if (openARM) {
-                s = "OpenJDK is not recommended for ARM. Use Oracle Java 8";
+                s = "OpenJDK 7/8 are not recommended for ARM. Use OpenJDK 9 (or higher) or Oracle Java 8 (or higher)";
                 log.logAlways(net.i2p.util.Log.WARN, s);
                 System.out.println("Warning: " + s);
             }
-            if (isJava11) {
-                s = "Java 11+ support is beta, and not recommended for general use";
-                log.logAlways(net.i2p.util.Log.WARN, s);
-                System.out.println("Warning: " + s);
-            }
+            //if (isJava11) {
+            //    s = "Java 11+ support is beta, and not recommended for general use";
+            //    log.logAlways(net.i2p.util.Log.WARN, s);
+            //    System.out.println("Warning: " + s);
+            //}
         }
     }