Currently in forky/sid but not trixie/resolute.
12.0.32-2 bundles 4 of the 6 ee8 jars we need.
It does not contain the ee8-nested and ee8-security jars, those are currently in
libjetty12-extra-java. Rather than require -extra-, we bundle those two jars into jetty-extra.jar for now,
as -extra- is very large and has a number of other dependencies.
We have requested that Debian move the two jars to the stndard package.
For the non-libjetty12 builds, those two jars remain in jetty-webapp.jar.
12.0.17 in trixie/resolute is unusable because it is missing the ee8 jars
and is not the official Jetty release version so we can't bundle the jars from the Jetty release,
they are incompatible.
This change removes the 12.0.17 ee8 jars we attempted to bundle.
The trixie/resolute build is still unusable, unless/until they get 12.0.32-2
Update various build.xml classpaths to include jetty-extra.jar.
Fix the reference to cgi-context.xml which was renamed.
There are no changes for the jammy build, which bundles all required Jetty jars,
other than the cgi-context fix.
Not fully tested
```
Java 17 bcprov 1.80 Jetty 12 libslf4j2 support
trixie y y y y y
bookworm y n n n y (jammy)
bullseye y n n n y (jammy)
buster n n n n n
resolute y y not yet y y (questing until it gets Jetty 12)
questing y y n y y
noble y n n n y (jammy)
jammy y n n n y
focal n n n n n
bionic n n n n n
```
to libjsp-api-java and libservlet-api-java
and update symbolic links to the jars in /usr/share/java
Note that the previous symlink to servlet-api-3.1.jar was
another symlink to servlet-api.jar which was actually API 4 anyway.
Bundle 2.0 API only; remove 1.1 API
Convert DoH, NDT, and i2pcontrol to the 2.x API
Fix i2pcontrol handling of number values and serialization for 2.x API
Remove xenial dependency on libjson-simple-java, it has only 1.1
Set min and max version constraint on libjson-simple-java for bionic+
Based on patch from Gilles Filippini
ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=901827
This does not support 3.x but the patch for that will be smaller.
Add debian-alt/stretch files
Update debian-alt/precise, trusty, xenial, bionic, disco to include
the changes from buster, not stretch
Remove debian-alt/buster, unstable files
Doc updates
Fix up LICENSES.txt
Build.xml cleanup
Debian:
- Add support for with-libtomcat8-java but not with-libjetty9-java for wheezy/jessie
- Fix wheezy/precise/trusty build files to use tomcat8 but not jetty9 packages
- Remove build dependency on ant-optional, not required
- Remove some remaining eclipse-ecj dependencies
- Add short README files for wheezy and jessie
- 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
link to /usr/share/java/httpclient.jar and httpcore.jar.
This is 2 MB of dependencies to replace 20 KB of copied code,
so may not be worth it, esp. for Tails.
Prep for dependency on libtomcat7
Doesn't work yet, breaks susidns.
glassfish-javaee for jstl.jar and standard.jar version 1.2 won't work with tomcat7,
it's ancient and not compatible with recent el libs.
Add back option to depend on libjakarta-taglibs-standard and libjstl1.1-java which are version 1.1.2,
but not clear if they will work with tomcat7 either, even though they are
dependencies of libjetty8-extra-java.
We switched from JSTL 1.1.2 to JSTL 1.2 when we went from Jetty 5 to Jetty 6 in 2012.
1.2 libs are not available anywhere except for Glassfish, and
Debian only has the ancient Java EE 5 Glassfish 2.1.
Not clear there's any way to get susidns (and bote) to work with both Tomcat 6 and 7.
- Fix wrong jsp-api version
- Fix other minor errors in install and links files.
- Log stack trace for Jetty warnings if log level is WARN
- SusiDNS: Move standard.jar and jstl.jar out of WEB-INF/lib, where Tomcat 7 build refuses to find them
Add dependency on libjetty8-java and libservlet3.0-java packages
Remove those binaries in debian builds
Prep for dependency on libservlet2.5-java package
Prep for dependency on libtomcat6-java package
Prep for dependency on libtomcat7-java package
Prep for dependency on libjakarta-taglibs-standard-java package
Prep for dependency on libjstl1.1-java package
Add build properties for building with packages
Rework of apps/jetty/build.xml for building with packages
Redefine debian/ as the files for the jessie build
Make debian-alt directories for ubuntu builds
Move debian/changelog to debian-alt/trusty/changelog
Move debian-alt/jessie/changelog to debian/changelog
Add apps/jetty/jettylib/jsp-api.jar to classpath for jsp builds
Include Maxmind geoip-api-java library v1.3.1 (LGPL v2.1)
Use Maxmind database for geoip lookup if it exists
Debian:
Don't bundle geoip.txt and geoipv6.dat.gz, depend on geoip-database instead
Don't bundle launch4j licenses in non-windows builds
Clarify in LICENSES.txt that launch4j is not bundled in non-windows builds and packages
Debian:
Change maintainer
Remove Debian patch that drops the launch4j licenses
zzz