forked from I2P_Developers/i2p.i2p
Debian builds:
- Remove with-libtomcat6-java and with-libtomcat7-java - Replace with-libjetty8-java with-libjetty9-java - Add libtomcat8-java dependency in debian builds - Change libservlet-3.0-java implicit dependency to libservlet-3.1-java - Initial mods for trusty build files, as it does not have jetty 9 - Initial xenial build files - Add link to jetty9-apache-jsp.jar - Add necessary util jars to jsp classpath Non-Debian builds: - Move tomcat runtime from javax.servlet.jar to jasper-runtime.jar, to be consistent with Jetty 8 - Switch from jetty (glassfish) to apache (tomcat) jsp implementation, to be consistent with Debian builds - Drop checked-in Tomcat 6 and Jetty 8 jars Code: - Force Jasper initialization in RouterConsoleRunner since we don't use the Jetty annotation scanner
This commit is contained in:
@ -34,7 +34,7 @@ pkg-temp/lib/streaming.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/systray.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libjetty8-java
|
||||
# uncomment if not building with libjetty9-java
|
||||
# ubuntu: in trusty vivid wily xenial
|
||||
# debian: in wheezy jessie stretch sid
|
||||
pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
|
||||
@ -51,7 +51,7 @@ pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
|
||||
# following two are from libservlet3.0-java which is a dependency of libjetty8-java
|
||||
# following two are from libservlet3.1-java which is a dependency of libjetty9-java
|
||||
pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user