Console: Change Java 10 warning to Java 11,

since bionic uses 10
This commit is contained in:
zzz
2018-05-31 17:16:00 +00:00
parent 481e28750b
commit 24a1cf713e
2 changed files with 16 additions and 3 deletions

View File

@ -330,8 +330,8 @@ public class RouterConsoleRunner implements RouterApp {
boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
!FileUtil.isPack200Supported();
boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK();
boolean isJava10 = SystemVersion.isJava10();
if (noJava7 || noPack200 || openARM || isJava10) {
boolean isJava11 = SystemVersion.isJava11();
if (noJava7 || noPack200 || openARM || isJava11) {
String s = "Java version: " + System.getProperty("java.version") +
" OS: " + System.getProperty("os.name") + ' ' +
System.getProperty("os.arch") + ' ' +
@ -354,7 +354,7 @@ public class RouterConsoleRunner implements RouterApp {
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);
}
if (isJava10) {
if (isJava11) {
s = "Java 10/11 support is beta, and not recommended for general use";
log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + s);