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

Plugins: Blacklist neodatis and seedless for Java 9+ (ticket #2295)

Browse Source
This commit is contained in:
zzz
2018-09-23 15:11:16 +00:00
parent 7a72049e28
commit e59d7a821b
4 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
View File

@ -28,6 +28,7 @@ import net.i2p.util.OrderedProperties;
import net.i2p.util.PortMapper;
import net.i2p.util.SecureDirectory;
import net.i2p.util.SecureFile;
import net.i2p.util.SystemVersion;
import net.i2p.util.VersionComparator;
@ -475,6 +476,15 @@ class PluginUpdateRunner extends UpdateRunner {
statusDone("<b>" + _t("Plugin requires Jetty version {0} or lower", "8.9999") + "</b>");
return;
}
if (SystemVersion.isJava9()) {
blacklistVersion = PluginStarter.java9Blacklist.get(appName);
if (blacklistVersion != null &&
VersionComparator.comp(version, blacklistVersion) <= 0) {
to.delete();
statusDone("<b>" + _t("Plugin requires Java version {0} or lower", "8.9999") + "</b>");
return;
}
}
maxVersion = PluginStarter.stripHTML(props, "max-jetty-version");
if (maxVersion != null &&
VersionComparator.comp(maxVersion, oldVersion) < 0) {