echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zzz
2018-12-24 13:24:58 +00:00
parent 0474876b58
commit 47629bf2cf
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -343,8 +343,8 @@ public class RouterConsoleRunner implements RouterApp {
boolean noJava7 = !SystemVersion.isJava7(); boolean noJava7 = !SystemVersion.isJava7();
boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) && boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
!FileUtil.isPack200Supported(); !FileUtil.isPack200Supported();
boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK(); boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK() && !SystemVersion.isJava9();
boolean isJava11 = SystemVersion.isJava11(); boolean isJava11 = false; // SystemVersion.isJava11();
if (noJava7 || noPack200 || openARM || isJava11) { if (noJava7 || noPack200 || openARM || isJava11) {
String s = "Java version: " + System.getProperty("java.version") + String s = "Java version: " + System.getProperty("java.version") +
" OS: " + System.getProperty("os.name") + ' ' + " OS: " + System.getProperty("os.name") + ' ' +
@ -364,15 +364,15 @@ public class RouterConsoleRunner implements RouterApp {
System.out.println("Warning: " + s); System.out.println("Warning: " + s);
} }
if (openARM) { 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); log.logAlways(net.i2p.util.Log.WARN, s);
System.out.println("Warning: " + 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);
//}
} }
} }

6
history.txt
View File

@ -1,3 +1,9 @@
2018-12-24 zzz
* Console: Update ARM warning (ticket #2368)
2018-12-23 zzz
* Console: Sybil tool background analysis setup form
2018-12-21 zzz 2018-12-21 zzz
* Transports: Improve banning of routers from wrong network * Transports: Improve banning of routers from wrong network

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 10; public final static long BUILD = 11;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";