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

Debian: Fix version detection of Tomcat 9 required for reproducible builds

Browse Source
This commit is contained in:
zzz
2019-01-31 11:55:43 +00:00
parent 68567cb531
commit 316011e047
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/jetty/java/src/net/i2p/servlet/util/JspC.java
View File

@@ -39,7 +39,8 @@ import net.i2p.util.VersionComparator;
*/
public class JspC {
// First Tomcat version to support multiple threads and -threadCount arg
private static final String THREADS_VERSION = "8.5.33";
private static final String THREADS_VERSION_8 = "8.5.33";
private static final String THREADS_VERSION_9 = "9.0.11";
// if true, try to make web.xml reproducible
private static final boolean REPRODUCIBLE = Boolean.valueOf(System.getProperty("build.reproducible"));
// if true, we must get the Tomcat version out of the jasper jar's manifest
@@ -109,8 +110,12 @@ public class JspC {
Attributes atts = attributes(JASPER_JAR);
if (atts != null) {
String ver = atts.getValue("Implementation-Version");
if (ver != null && ver.startsWith("8.")) {
supportsThreads = VersionComparator.comp(ver, THREADS_VERSION) >= 0;
if (ver != null) {
if (ver.startsWith("8.")) {
supportsThreads = VersionComparator.comp(ver, THREADS_VERSION_8) >= 0;
} else {
supportsThreads = VersionComparator.comp(ver, THREADS_VERSION_9) >= 0;
}
System.out.println("Found JspC version: " + ver + ", supports threads? " + supportsThreads);
}
}