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

Console: Log warning on upcoming Java 17 requirement

Browse Source
This commit is contained in:
zzz
2025-05-19 17:52:42 -04:00
parent 312f20be9b
commit a83feae229
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,13 +371,10 @@ public class RouterConsoleRunner implements RouterApp {
/** @since 0.9.17 */ /** @since 0.9.17 */
private void checkJavaVersion() { private void checkJavaVersion() {
boolean noJava8 = !SystemVersion.isJava8(); boolean noJava8 = !SystemVersion.isJava8();
//boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
// !FileUtil.isPack200Supported();
boolean noPack200 = false;
boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK() && !SystemVersion.isJava9(); boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK() && !SystemVersion.isJava9();
boolean isZero = SystemVersion.isZeroVM(); boolean isZero = SystemVersion.isZeroVM();
boolean isJava11 = false; // SystemVersion.isJava11(); boolean isJava17 = SystemVersion.isJava(17);
if (noJava8 || noPack200 || openARM || isZero || isJava11) { if (noJava8 || openARM || isZero || !isJava17) {
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") + ' ' +
System.getProperty("os.arch") + ' ' + System.getProperty("os.arch") + ' ' +
@ -385,16 +382,13 @@ public class RouterConsoleRunner implements RouterApp {
net.i2p.util.Log log = _context.logManager().getLog(RouterConsoleRunner.class); net.i2p.util.Log log = _context.logManager().getLog(RouterConsoleRunner.class);
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 (noJava8) { if (!isJava17) {
s = "Java 8 or higher is required, please upgrade Java"; s = "Java 17 or higher will be required in a future release, please upgrade Java now to continue receiving I2P updates";
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 (noPack200) { if (noJava8) {
if (SystemVersion.isJava(14)) s = "Java 8 or higher is required, please upgrade Java";
s = "Pack200 is required for some plugins, please consider downgrading Java to 13 or lower";
else
s = "Pack200 is required for some plugins, please consider upgrading Java";
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);
} }