forked from I2P_Developers/i2p.i2p
Build: Fix hang with Tomcat 8.5.33+ (ticket #2307)
This commit is contained in:
@ -353,7 +353,13 @@
|
||||
<mkdir dir="../jsp/WEB-INF/" />
|
||||
<mkdir dir="../jsp/WEB-INF/classes" />
|
||||
|
||||
<!-- there are various jspc ant tasks, but they all seem a bit flakey -->
|
||||
<!-- There are various jspc ant tasks, but they all seem a bit flakey.
|
||||
Warning - jspC will fail on unknown options,
|
||||
check oldest libtomcat8-java distro package version we use.
|
||||
Jessie has 8.0.14; xenial has 8.0.32; we bundle for precise/trusty.
|
||||
Add below to get supported options:
|
||||
<arg value="-help" />
|
||||
-->
|
||||
<!--
|
||||
** Usage: jspc <options> <jsp files>
|
||||
** where jsp files is
|
||||
@ -381,8 +387,28 @@
|
||||
** -classpath <path> Overrides java.class.path system property
|
||||
** -xpoweredBy Add X-Powered-By response header
|
||||
** -trimSpaces Trim spaces in template text between actions, directives
|
||||
** Following as of ?.?.??:
|
||||
** -javaEncoding <enc> Set the encoding charset for Java classes (default UTF-8)
|
||||
** -source <version> Set the -source argument to the compiler (default 1.7)
|
||||
** -target <version> Set the -target argument to the compiler (default 1.7)
|
||||
** Following as of 8.5.33:
|
||||
** -threadCount <count> Number of threads to use for compilation.
|
||||
** (default one per core)
|
||||
** ("2.0C" means two threads per core)
|
||||
-->
|
||||
<java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
|
||||
<!--
|
||||
** Simply call org.apache.jasper.JspC, then exit.
|
||||
**
|
||||
** As of Tomcat 8.5.33, forking their JspC won't complete,
|
||||
** because the JspC compilation is now threaded and the thread pool workers aren't daemons.
|
||||
** May be fixed in a future release, maybe not, but we don't know what version distros may have.
|
||||
**
|
||||
** https://tomcat.apache.org/tomcat-8.5-doc/changelog.html
|
||||
** https://bz.apache.org/bugzilla/show_bug.cgi?id=53492
|
||||
**
|
||||
** We could set fork=false in build.xml, but then the paths are all wrong.
|
||||
-->
|
||||
<java classname="net.i2p.servlet.util.JspC" fork="true" failonerror="true">
|
||||
<!-- this prevents tomcat from complaining in debian builds -->
|
||||
<jvmarg value="-Dtomcat.util.scan.StandardJarScanFilter.jarsToSkip=commons-collections.jar,junit.jar,junit4.jar" />
|
||||
<classpath>
|
||||
|
Reference in New Issue
Block a user