Changeset 316011e for apps


Ignore:
Timestamp:
Jan 31, 2019 11:55:43 AM (16 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
ec5e2db
Parents:
68567cb
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/java/src/net/i2p/servlet/util/JspC.java

    r68567cb r316011e  
    4040public class JspC {
    4141    // First Tomcat version to support multiple threads and -threadCount arg
    42     private static final String THREADS_VERSION = "8.5.33";
     42    private static final String THREADS_VERSION_8 = "8.5.33";
     43    private static final String THREADS_VERSION_9 = "9.0.11";
    4344    // if true, try to make web.xml reproducible
    4445    private static final boolean REPRODUCIBLE = Boolean.valueOf(System.getProperty("build.reproducible"));
     
    110111                if (atts != null) {
    111112                    String ver = atts.getValue("Implementation-Version");
    112                     if (ver != null && ver.startsWith("8.")) {
    113                         supportsThreads = VersionComparator.comp(ver, THREADS_VERSION) >= 0;
     113                    if (ver != null) {
     114                        if (ver.startsWith("8.")) {
     115                            supportsThreads = VersionComparator.comp(ver, THREADS_VERSION_8) >= 0;
     116                        } else {
     117                            supportsThreads = VersionComparator.comp(ver, THREADS_VERSION_9) >= 0;
     118                        }
    114119                        System.out.println("Found JspC version: " + ver + ", supports threads? " + supportsThreads);
    115120                    }
Note: See TracChangeset for help on using the changeset viewer.