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

Tomcat 9.0.35 (Servlet 4.0)

Browse Source 
Switch Bionic to 9.x
Disco+ already on 9.x
Xenial remains on 8.x
Update dependencies doc
This commit is contained in:
zzz
2020-05-31 15:35:18 +00:00
parent 317bf1e9db
commit edfbc4081b
23 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian-alt/bionic/control
View File

@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9.20160709)
,openjdk-8-jdk
,libjetty9-java (>= 9.4)
,libtaglibs-standard-jstlel-java
,libtomcat8-java
,libtomcat9-java
,dh-apparmor
,bash-completion
,gettext
@ -81,7 +81,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
libjson-simple-java (>= 2),libjson-simple-java (<< 3),
libjetty9-java (>= 9.4),
libtaglibs-standard-jstlel-java,
libtomcat8-java,
libtomcat9-java,
famfamfam-flag-png
Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)

18
debian-alt/bionic/i2p-router.links
View File

@ -33,21 +33,21 @@ usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
# comment out if not building with libtomcat8-java
# comment out if not building with libtomcat9-java
# ubuntu: only in xenial+
# debian: wheezy-backports, jessie+
# legacy name, contains only tomcat-juli, not commons-logging
usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
usr/share/java/tomcat9-juli.jar usr/share/i2p/lib/commons-logging.jar
usr/share/java/tomcat9-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
# combined into jasper-runtime.jar in non-package builds
usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
usr/share/java/tomcat9-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
usr/share/java/tomcat9-api.jar usr/share/i2p/lib/tomcat-api.jar
usr/share/java/tomcat9-util.jar usr/share/i2p/lib/tomcat-util.jar
usr/share/java/tomcat9-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
# combined into commons-el.jar in non-package builds
usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
usr/share/java/tomcat9-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
# legacy name in lib/
usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
usr/share/java/tomcat9-el-api.jar usr/share/i2p/lib/commons-el.jar
# tomcat pulls in ecj, link to it for eepsite webapps needing a compiler
usr/share/java/ecj.jar usr/share/i2p/lib/ecj.jar

20
debian-alt/bionic/rules
View File

@ -109,20 +109,20 @@ endif
ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
@# this is roughly the same as tomcat9-jsp-api.jar, we use this one
ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
@# debian and ubuntu: wheezy-backports, jessie+, xenial+
@/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
@/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties
mkdir -p $(CURDIR)/apps/jetty/jettylib
ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
ln -sf /usr/share/java/tomcat9-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
ln -sf /usr/share/java/tomcat9-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
ln -sf /usr/share/java/tomcat9-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
ln -sf /usr/share/java/tomcat9-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
ln -sf /usr/share/java/tomcat9-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
ln -sf /usr/share/java/tomcat9-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
ln -sf /usr/share/java/tomcat9-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
ln -sf /usr/share/java/tomcat9-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
@# debian and ubuntu: stretch+, zesty+
@/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties

21
debian-alt/doc/dependencies.txt
View File

@ -8,7 +8,7 @@ improve our official packages and support other packagers.
Our packages are available at https://deb.i2p2.de/ and
instructions are at https://geti2p.net/debian
This document is current as of release 0.9.38, 2018-01-xx.
This document is current as of release 0.9.47, 2020-08-xx.
Build-only Dependencies
@ -18,8 +18,7 @@ Build-only Dependencies
This is the standard java build system.
* Java JDK
We require openjdk-7-java or higher to build. For 8, set bootclasspath to
java 7 jars if available.
We require openjdk-8-java or higher to build.
For 9 or higher, require the same or higher runtime, since bootclasspath
isn't possible.
@ -30,7 +29,7 @@ Current Runtime Dependencies
----------------------------
* Java JRE
We require Java 7 or higher runtime, if built with Java 7 or bootclasspath was set
We require Java 8 or higher runtime, if built with Java 8 or bootclasspath was set
in the build. If built with 8 or higher and bootclasspath was not set,
then require the same JRE or higher.
@ -48,21 +47,21 @@ Current Runtime Dependencies
* libjson-simple-java (jessie and later, trusty and later only)
For /usr/share/java/json-simple.jar.
In non-Debian builds we bundle the 1.1.1 source code; it's removed in the Debian source package.
Compatible with 1.x and 2.x only; not compatible with 3.x.
In non-Debian builds we bundle the 2.x API portion of the 2.3.0 source code; it's removed in the Debian source package.
Compatible with 2.x only; not compatible with 3.x.
* libjetty9-java
For /usr/share/java/jetty9-*.jar.
In non-Debian builds we bundle the jars; it's removed in the Debian source package.
This is for Jetty 9.3.x, which is the same as 9.4.x except it's Java 8 compatible.
* libtomcat8-java
For /usr/share/java/tomcat8-*.jar.
* libtomcat9-java
For /usr/share/java/tomcat9-*.jar.
In non-Debian builds we bundle the jars as packaged in the Jetty 9.2 binary release,
which are different than the way they are packaged for Debian.
They are removed in the Debian source package.
This is for Tomcat 8.5.x, which is what's in recent Debian/Ubuntu.
Tomcat 8.0.x in older Debian/Ubuntu may or may not work.
This is for Tomcat 9.0.x, which is what's in recent Debian/Ubuntu.
Tomcat 8.5.x in Xenial also works.
* libtaglibs-standard-*-java (stretch and later, artful and later only)
Provides JSTL 1.2, solves the glassfish-javaee problem described below.
@ -93,7 +92,7 @@ Current Runtime Dependencies
* famfamfam-flag-png
Country flags (all except precise)
In precise and non-Debian builds we bundle the flags.
In non-Debian builds we bundle the flags.
Bundled code, NOT current dependencies