[Git][java-team/jetty12][master] 21 commits: Depend on libtomcat10-java instead of libtomcat11-java
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Thu Feb 26 10:39:17 GMT 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jetty12
Commits:
61045e1d by Emmanuel Bourg at 2026-02-23T17:07:51+01:00
Depend on libtomcat10-java instead of libtomcat11-java
- - - - -
9ff19b34 by Emmanuel Bourg at 2026-02-23T17:11:16+01:00
Install the jetty-ee9 configuration files
- - - - -
0e1bb204 by Emmanuel Bourg at 2026-02-24T18:03:21+01:00
Build the Java EE 8 modules (Closes: #1108370)
- - - - -
038aaba9 by Emmanuel Bourg at 2026-02-24T18:03:21+01:00
Require Java 17 or higher to run
- - - - -
3dd781b6 by Emmanuel Bourg at 2026-02-26T09:39:54+01:00
Create the jetty user with systemd-sysusers
- - - - -
321a059d by Emmanuel Bourg at 2026-02-26T09:39:54+01:00
Removed the dead links in /usr/share/jetty12/lib/
- - - - -
880273e3 by Emmanuel Bourg at 2026-02-26T09:39:54+01:00
Added the missing dependencies on the binary packages
- - - - -
704a5ead by Emmanuel Bourg at 2026-02-26T09:39:54+01:00
Tightened the dependency on libasm-java for libjetty12-extra-java
- - - - -
3177329d by Emmanuel Bourg at 2026-02-26T09:39:54+01:00
Updated the modules enabled by default in start.ini (Closes: #1108253)
- - - - -
5a93357e by Emmanuel Bourg at 2026-02-26T09:39:54+01:00
Install the missing ee-webapp, jndi and plus .mod files
- - - - -
5424d32e by Emmanuel Bourg at 2026-02-26T09:39:54+01:00
Fixed the broken link to jakarta.cdi-api.jar
- - - - -
22216438 by Emmanuel Bourg at 2026-02-26T09:40:35+01:00
Adjusted the classpath of the modules to match the jars in /usr/share/jetty12/lib
- - - - -
db8c67eb by Emmanuel Bourg at 2026-02-26T09:40:35+01:00
Create the $JETTY_BASE/lib/ext and $JETTY_BASE/resources directories
- - - - -
6e7b3ab9 by Emmanuel Bourg at 2026-02-26T09:40:35+01:00
Set the JETTY_BASE variable in the service file
- - - - -
a99ca131 by Emmanuel Bourg at 2026-02-26T09:40:35+01:00
Removed the unused JETTY_USER variable from /etc/default/jetty12
- - - - -
8fc1eb77 by Emmanuel Bourg at 2026-02-26T09:40:35+01:00
Install the shaded start.jar in /usr/share/jetty12
- - - - -
4637ec20 by Emmanuel Bourg at 2026-02-26T09:40:35+01:00
No longer use the upstream init.d script to start Jetty with systemd
- - - - -
b158e774 by Emmanuel Bourg at 2026-02-26T09:40:35+01:00
Install the symlinks to start.ini, start.d and the log directory in JETTY_BASE (/var/lib/jetty12) instead of JETTY_HOME (/usr/share/jetty12)
- - - - -
1d30b2b1 by Emmanuel Bourg at 2026-02-26T11:15:46+01:00
No longer manage the log directory permissions with systemd to keep it under the adm group
- - - - -
f1d0fe33 by Emmanuel Bourg at 2026-02-26T11:21:01+01:00
Fixed the removal of webapps/root/jetty_logo.png when uninstalling
- - - - -
6ebfbf85 by Emmanuel Bourg at 2026-02-26T11:23:03+01:00
Upload to unstable
- - - - -
24 changed files:
- debian/changelog
- debian/control
- debian/jetty12.default
- debian/jetty12.dirs
- debian/jetty12.install
- debian/jetty12.links
- debian/jetty12.postinst
- debian/jetty12.prerm
- debian/jetty12.service
- + debian/libexec/jetty-locate-java.sh
- + debian/libexec/jetty-start.sh
- − debian/libjetty12-java.classpath
- debian/libjetty12-java.poms
- debian/maven.ignoreRules
- debian/maven.properties
- debian/maven.rules
- debian/patches/09-tweak-distribution.patch
- debian/patches/16-jakarta-authentication-api-compatibility.patch
- + debian/patches/19-fix-jettyee8-javaee-dependencies.patch
- + debian/patches/20-jetty-modules-classpath.patch
- debian/patches/series
- debian/rules
- debian/start.ini
- + debian/sysusers/jetty12.conf
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,30 @@
+jetty12 (12.0.32-2) unstable; urgency=medium
+
+ * Build the Java EE 8 modules (Closes: #1108370)
+ * Updated the modules enabled by default in start.ini (Closes: #1108253)
+ * Install the shaded start.jar in /usr/share/jetty12
+ * Install the jetty-ee9 configuration files
+ * Install the missing ee-webapp, jndi and plus .mod files
+ * Install the symlinks to start.ini, start.d and the log directory
+ in JETTY_BASE (/var/lib/jetty12) instead of JETTY_HOME (/usr/share/jetty12)
+ * Removed the dead links in /usr/share/jetty12/lib/
+ * Added the missing dependencies on the binary packages
+ * Adjusted the classpath of the modules to match the jars
+ in /usr/share/jetty12/lib
+ * Depend on libtomcat10-java instead of libtomcat11-java
+ * Tightened the dependency on libasm-java for libjetty12-extra-java
+ * Require Java 17 or higher to run
+ * Create the jetty user with systemd-sysusers
+ * Create the $JETTY_BASE/lib/ext and $JETTY_BASE/resources directories
+ * Set the JETTY_BASE variable in the service file
+ * No longer use the upstream init.d script to start Jetty with systemd
+ * Removed the unused JETTY_USER variable from /etc/default/jetty12
+ * No longer manage the log directory permissions with systemd
+ to keep it under the adm group
+ * Fixed the removal of webapps/root/jetty_logo.png when uninstalling
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 26 Feb 2026 11:22:54 +0100
+
jetty12 (12.0.32-1) unstable; urgency=medium
* New upstream release
=====================================
debian/control
=====================================
@@ -17,12 +17,14 @@ Build-Depends:
libeclipse-osgi-java,
libeclipse-osgi-services-java,
libel-api-java,
+ libgeronimo-annotation-1.3-spec-java,
libgeronimo-jta-1.2-spec-java,
libjackson2-core-java,
libjakarta-activation-java,
libjakarta-authentication-api-java,
- libjakarta-cdi-api-java,
+ libjakarta-cdi-api-java (>= 4.0.1-3~),
libjakarta-interceptor-api-java,
+ libjakarta-jsp-api-java,
libjakarta-mail-java,
libjakarta-servlet-api-java (>= 6.1.0-2~),
libjakarta-standard-taglib-api-java,
@@ -30,6 +32,7 @@ Build-Depends:
libjakarta-transaction-api-java,
libjboss-logging-java,
libjcip-annotations-java,
+ libjetty-modify-sources-maven-plugin-java,
libjnr-unixsocket-java,
libjsp-api-java,
libmail-java,
@@ -47,7 +50,7 @@ Build-Depends:
libtaglibs-standard-impl-java,
libtaglibs-standard-spec-java,
libtomcat9-java,
- libtomcat11-java,
+ libtomcat10-java,
libwebsocket-api-java,
maven-debian-helper (>= 2.2.8~),
maven-repo-helper
@@ -61,9 +64,18 @@ Architecture: all
Depends:
libel-api-java,
libjakarta-annotation-api-java,
+ libjakarta-el-api-java,
+ libjakarta-jsp-api-java,
+ libjakarta-servlet-api-java,
+ libjakarta-standard-taglib-api-java,
+ libjakarta-standard-taglib-impl-java,
libjsp-api-java,
libservlet-api-java,
- libwebsocket-api-java,
+ libslf4j2-java,
+ libtaglibs-standard-impl-java,
+ libtaglibs-standard-spec-java,
+ libtomcat9-java,
+ libtomcat10-java,
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: Java servlet engine and webserver -- core libraries
@@ -77,14 +89,17 @@ Description: Java servlet engine and webserver -- core libraries
Package: libjetty12-extra-java
Architecture: all
Depends:
- libasm-java (>= 7.0),
+ libasm-java (>= 9.7),
+ libgeronimo-jta-1.2-spec-java,
+ libjakarta-authentication-api-java,
+ libjakarta-cdi-api-java (>= 4.0.1-3~),
+ libjakarta-interceptor-api-java,
+ libjakarta-transaction-api-java,
libjetty12-java (>= ${source:Version}),
libjnr-unixsocket-java,
libmail-java,
libspring-beans-java,
- libtaglibs-standard-impl-java,
- libtaglibs-standard-spec-java,
- libtomcat9-java,
+ libwebsocket-api-java,
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
Description: Java servlet engine and webserver -- extra libraries
@@ -101,10 +116,11 @@ Architecture: all
Depends:
adduser,
apache2-utils,
- default-jre-headless (>= 2:1.8) | java8-runtime-headless,
+ default-jre-headless (>= 2:1.17) | java17-runtime-headless,
libeclipse-jdt-core-java,
libjetty12-extra-java (>= ${source:Version}),
libjetty12-java (>= ${source:Version}),
+ systemd (>= 238) | systemd-sysusers,
sysvinit-utils (>= 3.05-4~),
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
=====================================
debian/jetty12.default
=====================================
@@ -1,12 +1,8 @@
# change to 'no' or uncomment to use the default setting in /etc/default/rcS
VERBOSE=yes
-# Run Jetty as this user ID (default: jetty)
-# Set this to an empty string to prevent Jetty from starting automatically
-#JETTY_USER=jetty
-
# The home directory of the Java Runtime Environment (JRE). You need at least
-# Java 8. If JAVA_HOME is not set, some common directories for OpenJDK and
+# Java 17. If JAVA_HOME is not set, some common directories for OpenJDK and
# the Oracle JDK are tried.
#JAVA_HOME=
=====================================
debian/jetty12.dirs
=====================================
@@ -4,5 +4,7 @@ usr/share/doc/jetty12
usr/share/jetty12
usr/share/jetty12/lib/ext
var/cache/jetty12
+var/lib/jetty12/lib/ext
+var/lib/jetty12/resources
var/lib/jetty12/webapps
var/log/jetty12
=====================================
debian/jetty12.install
=====================================
@@ -1,9 +1,18 @@
debian/rsyslog/* /etc/rsyslog.d/
+debian/sysusers/*.conf /usr/lib/sysusers.d/
+
+debian/libexec/jetty-start.sh /usr/libexec/jetty12/
+debian/libexec/jetty-locate-java.sh /usr/libexec/jetty12/
+
debian/jetty12.timer /etc/sytemd/system/jetty12.timer
+jetty-core/jetty-start/target/start.jar usr/share/jetty12/
jetty-home/target/jetty-home/etc/* etc/jetty12/
jetty-home/target/jetty-home/bin/* usr/share/jetty12/bin/
jetty-home/target/jetty-home/modules/* usr/share/jetty12/modules/
+jetty-core/jetty-ee/src/main/config/modules/ee-webapp.mod usr/share/jetty12/modules/
+jetty-core/jetty-jndi/src/main/config/modules/jndi.mod usr/share/jetty12/modules/
+jetty-core/jetty-plus/src/main/config/modules/plus.mod usr/share/jetty12/modules/
debian/start.ini etc/jetty12
debian/root-webapp/* usr/share/jetty12/default-root
=====================================
debian/jetty12.links
=====================================
@@ -1,12 +1,10 @@
#!/usr/bin/dh-exec
-var/lib/jetty12/webapps usr/share/jetty12/webapps
-var/log/jetty12 usr/share/jetty12/logs
etc/jetty12 usr/share/jetty12/etc
-etc/jetty12/start.d usr/share/jetty12/start.d
-etc/jetty12/start.ini usr/share/jetty12/start.ini
+etc/jetty12/start.d var/lib/jetty12/start.d
+etc/jetty12/start.ini var/lib/jetty12/start.ini
+var/log/jetty12 var/lib/jetty12/logs
-usr/share/java/jetty12-start.jar usr/share/jetty12/start.jar
usr/share/java/jetty12-fcgi-client.jar usr/share/jetty12/lib/fcgi/jetty-fcgi-client-${VERSION}.jar
usr/share/java/jetty12-fcgi-proxy.jar usr/share/jetty12/lib/fcgi/jetty-fcgi-proxy-${VERSION}.jar
usr/share/java/jetty12-fcgi-server.jar usr/share/jetty12/lib/fcgi/jetty-fcgi-server-${VERSION}.jar
@@ -15,26 +13,26 @@ usr/share/java/jetty12-http2-hpack.jar usr/share/jetty12/lib/http2
usr/share/java/jetty12-http2-server.jar usr/share/jetty12/lib/http2/jetty-http2-server-${VERSION}.jar
usr/share/java/jetty12-alpn-bouncycastle-server.jar usr/share/jetty12/lib/jetty-alpn-bouncycastle-server-${VERSION}.jar
usr/share/java/jetty12-alpn-client.jar usr/share/jetty12/lib/jetty-alpn-client-${VERSION}.jar
-usr/share/java/jetty12-alpn-conscrypt-server.jar usr/share/jetty12/lib/jetty-alpn-conscrypt-server-${VERSION}.jar
+#usr/share/java/jetty12-alpn-conscrypt-server.jar usr/share/jetty12/lib/jetty-alpn-conscrypt-server-${VERSION}.jar
usr/share/java/jetty12-alpn-java-client.jar usr/share/jetty12/lib/jetty-alpn-java-client-${VERSION}.jar
usr/share/java/jetty12-alpn-java-server.jar usr/share/jetty12/lib/jetty-alpn-java-server-${VERSION}.jar
usr/share/java/jetty12-alpn-server.jar usr/share/jetty12/lib/jetty-alpn-server-${VERSION}.jar
usr/share/java/jetty12-client.jar usr/share/jetty12/lib/jetty-client-${VERSION}.jar
-usr/share/java/jetty12-demo-handler.jar usr/share/jetty12/lib/jetty-demo-handler-${VERSION}.jar
+#usr/share/java/jetty12-demo-handler.jar usr/share/jetty12/lib/jetty-demo-handler-${VERSION}.jar
usr/share/java/jetty12-deploy.jar usr/share/jetty12/lib/jetty-deploy-${VERSION}.jar
usr/share/java/jetty12-ee.jar usr/share/jetty12/lib/jetty-ee-${VERSION}.jar
-usr/share/java/jetty12-gcloud-session-manager.jar usr/share/jetty12/lib/jetty-gcloud-session-manager-${VERSION}.jar
-usr/share/java/jetty12-hazelcast.jar usr/share/jetty12/lib/jetty-hazelcast-${VERSION}.jar
+#usr/share/java/jetty12-gcloud-session-manager.jar usr/share/jetty12/lib/jetty-gcloud-session-manager-${VERSION}.jar
+#usr/share/java/jetty12-hazelcast.jar usr/share/jetty12/lib/jetty-hazelcast-${VERSION}.jar
usr/share/java/jetty12-http.jar usr/share/jetty12/lib/jetty-http-${VERSION}.jar
-usr/share/java/jetty12-infinispan-common.jar usr/share/jetty12/lib/jetty-infinispan-common-${VERSION}.jar
-usr/share/java/jetty12-infinispan-embedded-query.jar usr/share/jetty12/lib/jetty-infinispan-embedded-query-${VERSION}.jar
-usr/share/java/jetty12-infinispan-remote-query.jar usr/share/jetty12/lib/jetty-infinispan-remote-query-${VERSION}.jar
+#usr/share/java/jetty12-infinispan-common.jar usr/share/jetty12/lib/jetty-infinispan-common-${VERSION}.jar
+#usr/share/java/jetty12-infinispan-embedded-query.jar usr/share/jetty12/lib/jetty-infinispan-embedded-query-${VERSION}.jar
+#usr/share/java/jetty12-infinispan-remote-query.jar usr/share/jetty12/lib/jetty-infinispan-remote-query-${VERSION}.jar
usr/share/java/jetty12-io.jar usr/share/jetty12/lib/jetty-io-${VERSION}.jar
usr/share/java/jetty12-jmx.jar usr/share/jetty12/lib/jetty-jmx-${VERSION}.jar
usr/share/java/jetty12-jndi.jar usr/share/jetty12/lib/jetty-jndi-${VERSION}.jar
usr/share/java/jetty12-keystore.jar usr/share/jetty12/lib/jetty-keystore-${VERSION}.jar
-usr/share/java/jetty12-memcached-sessions.jar usr/share/jetty12/lib/jetty-memcached-sessions-${VERSION}.jar
-usr/share/java/jetty12-nosql.jar usr/share/jetty12/lib/jetty-nosql-${VERSION}.jar
+#usr/share/java/jetty12-memcached-sessions.jar usr/share/jetty12/lib/jetty-memcached-sessions-${VERSION}.jar
+#usr/share/java/jetty12-nosql.jar usr/share/jetty12/lib/jetty-nosql-${VERSION}.jar
usr/share/java/jetty12-openid.jar usr/share/jetty12/lib/jetty-openid-${VERSION}.jar
usr/share/java/jetty12-plus.jar usr/share/jetty12/lib/jetty-plus-${VERSION}.jar
usr/share/java/jetty12-proxy.jar usr/share/jetty12/lib/jetty-proxy-${VERSION}.jar
@@ -53,6 +51,29 @@ usr/share/java/jetty12-websocket-jetty-client.jar usr/share/jetty12/lib/jetty
usr/share/java/jetty12-websocket-jetty-common.jar usr/share/jetty12/lib/jetty-websocket-jetty-common-${VERSION}.jar
usr/share/java/jetty12-xml.jar usr/share/jetty12/lib/jetty-xml-${VERSION}.jar
usr/share/java/jetty12-slf4j-impl.jar usr/share/jetty12/lib/logging/jetty-slf4j-impl-${VERSION}.jar
+usr/share/java/jetty12-ee8-annotations.jar usr/share/jetty12/lib/jetty-ee8-annotations-${VERSION}.jar
+usr/share/java/jetty12-ee8-apache-jsp.jar usr/share/jetty12/lib/jetty-ee8-apache-jsp-${VERSION}.jar
+usr/share/java/jetty12-ee8-cdi.jar usr/share/jetty12/lib/jetty-ee8-cdi-${VERSION}.jar
+usr/share/java/jetty12-ee8-glassfish-jstl.jar usr/share/jetty12/lib/jetty-ee8-glassfish-jstl-${VERSION}.jar
+usr/share/java/jetty12-ee8-jndi.jar usr/share/jetty12/lib/jetty-ee8-jndi-${VERSION}.jar
+usr/share/java/jetty12-ee8-nested.jar usr/share/jetty12/lib/jetty-ee8-nested-${VERSION}.jar
+usr/share/java/jetty12-ee8-openid.jar usr/share/jetty12/lib/jetty-ee8-openid-${VERSION}.jar
+usr/share/java/jetty12-ee8-plus.jar usr/share/jetty12/lib/jetty-ee8-plus-${VERSION}.jar
+usr/share/java/jetty12-ee8-proxy.jar usr/share/jetty12/lib/jetty-ee8-proxy-${VERSION}.jar
+usr/share/java/jetty12-ee8-quickstart.jar usr/share/jetty12/lib/jetty-ee8-quickstart-${VERSION}.jar
+usr/share/java/jetty12-ee8-security.jar usr/share/jetty12/lib/jetty-ee8-security-${VERSION}.jar
+usr/share/java/jetty12-ee8-servlet.jar usr/share/jetty12/lib/jetty-ee8-servlet-${VERSION}.jar
+usr/share/java/jetty12-ee8-servlets.jar usr/share/jetty12/lib/jetty-ee8-servlets-${VERSION}.jar
+usr/share/java/jetty12-ee8-webapp.jar usr/share/jetty12/lib/jetty-ee8-webapp-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-javax-client.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-javax-client-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-javax-common.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-javax-common-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-javax-server.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-javax-server-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-jetty-api.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-jetty-api-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-jetty-client.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-jetty-client-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-jetty-client-webapp.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-jetty-client-webapp-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-jetty-common.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-jetty-common-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-jetty-server.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-jetty-server-${VERSION}.jar
+usr/share/java/jetty12-ee8-websocket-servlet.jar usr/share/jetty12/lib/ee8-websocket/jetty-ee8-websocket-servlet-${VERSION}.jar
usr/share/java/jetty12-ee9-annotations.jar usr/share/jetty12/lib/jetty-ee9-annotations-${VERSION}.jar
usr/share/java/jetty12-ee9-apache-jsp.jar usr/share/jetty12/lib/jetty-ee9-apache-jsp-${VERSION}.jar
usr/share/java/jetty12-ee9-cdi.jar usr/share/jetty12/lib/jetty-ee9-cdi-${VERSION}.jar
@@ -104,23 +125,48 @@ usr/share/java/jakarta-inject-api.jar usr/share/jetty12/lib/jakar
usr/share/java/jakarta-interceptor-api.jar usr/share/jetty12/lib/jakarta.interceptor-api.jar
usr/share/java/jakarta-servlet-api.jar usr/share/jetty12/lib/jakarta.servlet-api.jar
usr/share/java/jakarta-transaction-api.jar usr/share/jetty12/lib/jakarta.transaction-api.jar
+usr/share/java/servlet-api.jar usr/share/jetty12/lib/javax.servlet-api.jar
+usr/share/java/geronimo-jta-1.2-spec.jar usr/share/jetty12/lib/javax.transaction-api.jar
+
+usr/share/java/asm.jar usr/share/jetty12/lib/ee8-annotations/asm.jar
+usr/share/java/asm-analysis.jar usr/share/jetty12/lib/ee8-annotations/asm-analysis.jar
+usr/share/java/asm-commons.jar usr/share/jetty12/lib/ee8-annotations/asm-commons.jar
+usr/share/java/asm-tree.jar usr/share/jetty12/lib/ee8-annotations/asm-tree.jar
+usr/share/java/geronimo-annotation-1.3-spec.jar usr/share/jetty12/lib/ee8-annotations/javax.annotation-api.jar
+usr/share/java/eclipse-jdt-core.jar usr/share/jetty12/lib/ee8-apache-jsp/org.eclipse.jdt.ecj.jar
+usr/share/java/tomcat9-jasper.jar usr/share/jetty12/lib/ee8-apache-jsp/org.mortbay.jasper.apache-jsp.jar
+usr/share/java/tomcat9-jasper-el.jar usr/share/jetty12/lib/ee8-apache-jsp/org.mortbay.jasper.apache-el.jar
+usr/share/java/taglibs-standard-spec.jar usr/share/jetty12/lib/ee8-glassfish-jstl/javax.servlet.jsp.jstl-api.jar
+usr/share/java/taglibs-standard-impl.jar usr/share/jetty12/lib/ee8-glassfish-jstl/javax.servlet.jsp.jstl-impl.jar
+usr/share/java/tomcat9-websocket-api.jar usr/share/jetty12/lib/ee8-websocket/jetty-javax-websocket-api.jar
+
usr/share/java/asm.jar usr/share/jetty12/lib/ee9-annotations/asm.jar
usr/share/java/asm-analysis.jar usr/share/jetty12/lib/ee9-annotations/asm-analysis.jar
usr/share/java/asm-commons.jar usr/share/jetty12/lib/ee9-annotations/asm-commons.jar
usr/share/java/asm-tree.jar usr/share/jetty12/lib/ee9-annotations/asm-tree.jar
usr/share/java/jakarta-annotation-api.jar usr/share/jetty12/lib/ee9-annotations/jakarta.annotation-api.jar
+usr/share/java/eclipse-jdt-core.jar usr/share/jetty12/lib/ee9-apache-jsp/org.eclipse.jdt.ecj.jar
+usr/share/java/tomcat10-jasper.jar usr/share/jetty12/lib/ee9-apache-jsp/org.mortbay.jasper.apache-jsp.jar
+usr/share/java/tomcat10-jasper-el.jar usr/share/jetty12/lib/ee9-apache-jsp/org.mortbay.jasper.apache-el.jar
+usr/share/java/jakarta-standard-taglib-api.jar usr/share/jetty12/lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl-api.jar
+usr/share/java/jakarta-standard-taglib-impl.jar usr/share/jetty12/lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl-impl.jar
usr/share/java/jakarta-authentication-api.jar usr/share/jetty12/lib/ee9-jaspi/jakarta.authentication-api.jar
-usr/share/java/tomcat11-websocket-api.jar usr/share/jetty12/lib/ee9-websocket/jakarta.websocket-api.jar
-usr/share/java/tomcat11-websocket-client-api.jar usr/share/jetty12/lib/ee9-websocket/jakarta.websocket-client-api.jar
+usr/share/java/tomcat10-websocket-api.jar usr/share/jetty12/lib/ee9-websocket/jakarta.websocket-api.jar
+
usr/share/java/asm.jar usr/share/jetty12/lib/ee10-annotations/asm.jar
usr/share/java/asm-analysis.jar usr/share/jetty12/lib/ee10-annotations/asm-analysis.jar
usr/share/java/asm-commons.jar usr/share/jetty12/lib/ee10-annotations/asm-commons.jar
usr/share/java/asm-tree.jar usr/share/jetty12/lib/ee10-annotations/asm-tree.jar
usr/share/java/jakarta-annotation-api.jar usr/share/jetty12/lib/ee10-annotations/jakarta.annotation-api.jar
-usr/share/java/eclipse-jdt-core.jar usr/share/jetty12/lib/ee10-apache-jsp/eclipse-jdt-core.jar
-usr/share/java/jakarta-el-api.jar usr/share/jetty12/lib/ee10-apache-jsp/jakarta-el-api.jar
-usr/share/java/jakarta-servlet-api.jar usr/share/jetty12/lib/ee10-apache-jsp/jakarta-servlet-api.jar
+usr/share/java/jakarta-el-api.jar usr/share/jetty12/lib/ee10-apache-jsp/jakarta.el-api.jar
+usr/share/java/jakarta-jsp-api.jar usr/share/jetty12/lib/ee10-apache-jsp/jakarta.servlet.jsp-api.jar
+usr/share/java/eclipse-jdt-core.jar usr/share/jetty12/lib/ee10-apache-jsp/org.eclipse.jdt.ecj.jar
+usr/share/java/tomcat10-jasper.jar usr/share/jetty12/lib/ee10-apache-jsp/org.mortbay.jasper.apache-jsp.jar
+usr/share/java/tomcat10-jasper-el.jar usr/share/jetty12/lib/ee10-apache-jsp/org.mortbay.jasper.apache-el.jar
+usr/share/java/jakarta-standard-taglib-api.jar usr/share/jetty12/lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl-api.jar
+usr/share/java/jakarta-standard-taglib-impl.jar usr/share/jetty12/lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl-impl.jar
usr/share/java/jakarta-authentication-api.jar usr/share/jetty12/lib/ee10-jaspi/jakarta.authentication-api.jar
-usr/share/java/tomcat11-websocket-api.jar usr/share/jetty12/lib/ee10-websocket/jakarta.websocket-api.jar
-usr/share/java/tomcat11-websocket-client-api.jar usr/share/jetty12/lib/ee10-websocket/jakarta.websocket-client-api.jar
-usr/share/java/slf4j-api.jar usr/share/jetty12/lib/logging/slf4j-api.jar
+usr/share/java/tomcat10-websocket-api.jar usr/share/jetty12/lib/ee10-websocket/jakarta.websocket-api.jar
+usr/share/java/tomcat10-websocket-client-api.jar usr/share/jetty12/lib/ee10-websocket/jakarta.websocket-client-api.jar
+
+usr/share/maven-repo/org/slf4j/slf4j-api/2.x/slf4j-api-2.x.jar usr/share/jetty12/lib/logging/slf4j-api.jar
=====================================
debian/jetty12.postinst
=====================================
@@ -6,6 +6,9 @@ JETTY_GROUP=jetty
case "$1" in
configure)
+ # Create the jetty user as defined in /usr/lib/sysusers.d/jetty12.conf
+ systemd-sysusers
+
# Install the default page if no root context exist
if [ ! -f /var/lib/jetty12/webapps/root.war ]; then
mkdir -p /var/lib/jetty12/webapps/root
@@ -14,11 +17,6 @@ case "$1" in
fi
fi
- if ! id jetty > /dev/null 2>&1 ; then
- adduser --system --home /usr/share/jetty12 --no-create-home \
- --group --disabled-password --shell /bin/false \
- $JETTY_USER
- fi
chown -Rh jetty:adm /var/cache/jetty12 /var/log/jetty12 /var/lib/jetty12
chmod 750 /var/log/jetty12
;;
=====================================
debian/jetty12.prerm
=====================================
@@ -8,9 +8,9 @@ case "$1" in
then
rm /var/lib/jetty12/webapps/root/index.html
fi
- if cmp --silent /var/lib/jetty12/webapps/root/jetty_banner.gif /usr/share/jetty12/default-root/jetty_banner.gif
+ if cmp --silent /var/lib/jetty12/webapps/root/jetty_logo.png /usr/share/jetty12/default-root/jetty_logo.png
then
- rm /var/lib/jetty12/webapps/root/jetty_banner.gif
+ rm /var/lib/jetty12/webapps/root/jetty_logo.png
fi
;;
esac
=====================================
debian/jetty12.service
=====================================
@@ -6,18 +6,18 @@
Description=Jetty 12 Web Application Server
Documentation=https://www.eclipse.org/jetty/documentation/current/
After=network.target
+RequiresMountsFor=/var/log/jetty12 /var/lib/jetty12
[Service]
# Configuration
Environment="JETTY_HOME=/usr/share/jetty12/"
-Environment="JETTY_STATE=/var/lib/jetty12/jetty.state"
+Environment="JETTY_BASE=/var/lib/jetty12/"
Environment="JAVA_OPTS=-Djava.awt.headless=true"
-EnvironmentFile=-/etc/default/jetty12
# Lifecycle
Type=simple
-ExecStart=/usr/share/jetty12/bin/jetty.sh run
+ExecStart=/bin/sh /usr/libexec/jetty12/jetty-start.sh
SuccessExitStatus=143
Restart=on-abort
@@ -31,10 +31,9 @@ PrivateTmp=yes
AmbientCapabilities=CAP_NET_BIND_SERVICE
NoNewPrivileges=true
WorkingDirectory=/usr/share/jetty12/
-LogsDirectory=jetty12
-LogsDirectoryMode=750
ProtectSystem=strict
ReadWritePaths=/var/lib/jetty12/
+ReadWritePaths=/var/log/jetty12/
[Install]
WantedBy=multi-user.target
=====================================
debian/libexec/jetty-locate-java.sh
=====================================
@@ -0,0 +1,50 @@
+#
+# Script looking for a Java runtime suitable for running Jetty
+#
+# The script looks for the default JRE/JDK, OpenJDK and Oracle JDK
+# as packaged by java-package. The Java runtime found is exported
+# in the JAVA_HOME environment variable.
+#
+
+set -e
+
+# Find the Java runtime if JAVA_HOME isn't already defined
+if [ -z "$JAVA_HOME" ]; then
+ # This function sets the variable JDK_DIRS
+ find_jdks()
+ {
+ for java_version in 29 28 27 26 25 21 17
+ do
+ for jvmdir in /usr/lib/jvm/java-${java_version}-openjdk-* \
+ /usr/lib/jvm/jdk-${java_version}-oracle-* \
+ /usr/lib/jvm/jre-${java_version}-oracle-* \
+ /usr/lib/jvm/java-${java_version}-oracle \
+ /usr/lib/jvm/oracle-java${java_version}-jdk-* \
+ /usr/lib/jvm/oracle-java${java_version}-jre-*
+ do
+ if [ -d "${jvmdir}" ]
+ then
+ JDK_DIRS="${JDK_DIRS} ${jvmdir}"
+ fi
+ done
+ done
+ }
+
+ # The first existing directory is used for JAVA_HOME
+ JDK_DIRS="/usr/lib/jvm/default-java"
+ find_jdks
+
+ # Look for the right JVM to use
+ for jdir in $JDK_DIRS; do
+ if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
+ JAVA_HOME="$jdir"
+ fi
+ done
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+ echo "<2>No JDK or JRE found - Please set the JAVA_HOME variable or install the default-jdk package"
+ exit 1
+fi
+
+export JAVA_HOME
=====================================
debian/libexec/jetty-start.sh
=====================================
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# Startup script for Jetty with systemd
+#
+
+set -e
+
+# Load the service settings
+. /etc/default/jetty12
+
+# Find the Java runtime and set JAVA_HOME
+. /usr/libexec/jetty12/jetty-locate-java.sh
+
+# Start Tomcat
+cd $CATALINA_BASE && exec $CATALINA_HOME/bin/catalina.sh run
+
+cd $JETTY_BASE && $JAVA_HOME/bin/java $JAVA_OPTIONS -jar $JETTY_HOME/start.jar -Djetty.base=$JETTY_BASE $JETTY_ARGS
=====================================
debian/libjetty12-java.classpath deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/jetty12-start.jar /usr/share/java/jetty12-util.jar
=====================================
debian/libjetty12-java.poms
=====================================
@@ -63,6 +63,15 @@ jetty-core/jetty-util-ajax/pom.xml --java-lib --usj
jetty-core/jetty-util/pom.xml --java-lib --usj-name=jetty12-util
jetty-core/jetty-xml/pom.xml --java-lib --usj-name=jetty12-xml
+jetty-ee8/pom.xml
+jetty-ee8/jetty-ee8-apache-jsp/pom.xml --java-lib --usj-name=jetty12-ee8-apache-jsp
+jetty-ee8/jetty-ee8-bom/pom.xml
+jetty-ee8/jetty-ee8-glassfish-jstl/pom.xml --java-lib --usj-name=jetty12-ee8-glassfish-jstl
+jetty-ee8/jetty-ee8-home/pom.xml --ignore-pom
+jetty-ee8/jetty-ee8-servlet/pom.xml --java-lib --usj-name=jetty12-ee8-servlet
+jetty-ee8/jetty-ee8-servlets/pom.xml --java-lib --usj-name=jetty12-ee8-servlets
+jetty-ee8/jetty-ee8-webapp/pom.xml --java-lib --usj-name=jetty12-ee8-webapp
+
jetty-ee9/pom.xml
jetty-ee9/jetty-ee9-apache-jsp/pom.xml --java-lib --usj-name=jetty12-ee9-apache-jsp
jetty-ee9/jetty-ee9-bom/pom.xml
@@ -102,6 +111,29 @@ jetty-core/jetty-websocket/jetty-websocket-jetty-client/pom.xml --java-lib --usj
jetty-core/jetty-websocket/jetty-websocket-jetty-common/pom.xml --java-lib --usj-name=jetty12-websocket-jetty-common --package=libjetty12-extra-java
jetty-core/jetty-websocket/jetty-websocket-jetty-server/pom.xml --java-lib --usj-name=jetty12-websocket-jetty-server --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-annotations/pom.xml --java-lib --usj-name=jetty12-ee8-annotations --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-cdi/pom.xml --java-lib --usj-name=jetty12-ee8-cdi --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-jaspi/pom.xml --java-lib --usj-name=jetty12-ee8-jaspi --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-jndi/pom.xml --java-lib --usj-name=jetty12-ee8-jndi --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-nested/pom.xml --java-lib --usj-name=jetty12-ee8-nested --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-openid/pom.xml --java-lib --usj-name=jetty12-ee8-openid --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-plus/pom.xml --java-lib --usj-name=jetty12-ee8-plus --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-proxy/pom.xml --java-lib --usj-name=jetty12-ee8-proxy --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-quickstart/pom.xml --java-lib --usj-name=jetty12-ee8-quickstart --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-runner/pom.xml --java-lib --usj-name=jetty12-ee8-runner --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-security/pom.xml --java-lib --usj-name=jetty12-ee8-security --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/pom.xml --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-javax-client --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-client-webapp/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-javax-client-webapp --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-common/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-javax-common --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-javax-server --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-api/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-jetty-api --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-jetty-client --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-client-webapp/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-jetty-client-webapp --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-common/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-jetty-common --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-server/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-jetty-server --package=libjetty12-extra-java
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-servlet/pom.xml --java-lib --usj-name=jetty12-ee8-websocket-servlet --package=libjetty12-extra-java
+
jetty-ee9/jetty-ee9-annotations/pom.xml --java-lib --usj-name=jetty12-ee9-annotations --package=libjetty12-extra-java
jetty-ee9/jetty-ee9-cdi/pom.xml --java-lib --usj-name=jetty12-ee9-cdi --package=libjetty12-extra-java
jetty-ee9/jetty-ee9-fcgi-proxy/pom.xml --java-lib --usj-name=jetty12-ee9-fcgi-proxy --package=libjetty12-extra-java
@@ -170,7 +202,12 @@ jetty-core/jetty-tests/jetty-test-jmx/pom.xml --igno
jetty-core/jetty-websocket/jetty-websocket-core-tests/pom.xml --ignore
jetty-core/jetty-websocket/jetty-websocket-jetty-tests/pom.xml --ignore
-jetty-ee8/pom.xml --ignore
+jetty-ee8/jetty-ee8-demos/pom.xml --ignore
+jetty-ee8/jetty-ee8-jspc-maven-plugin/pom.xml --ignore
+jetty-ee8/jetty-ee8-maven-plugin/pom.xml --ignore
+jetty-ee8/jetty-ee8-osgi/pom.xml --ignore
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-tests/pom.xml --ignore
+jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-jetty-tests/pom.xml --ignore
jetty-ee9/jetty-ee9-demos/pom.xml --ignore
jetty-ee9/jetty-ee9-jspc-maven-plugin/pom.xml --ignore
=====================================
debian/maven.ignoreRules
=====================================
@@ -35,6 +35,7 @@ org.eclipse.jetty jetty-hazelcast
org.eclipse.jetty jetty-home zip
org.eclipse.jetty jetty-nosql
org.eclipse.jetty.demos jetty-demo-handler
+org.eclipse.jetty.ee8.demos
org.eclipse.jetty.ee9.demos
org.eclipse.jetty.ee10.demos
org.eclipse.jetty.ee8 jetty-ee8-home zip
=====================================
debian/maven.properties
=====================================
@@ -1,5 +1,5 @@
maven.test.skip=true
-maven.compiler.release=7
+maven.compiler.release=17
jakarta.servlet.api.version=6.1.0
jakarta.transaction-api.version=debian
=====================================
debian/maven.rules
=====================================
@@ -1,7 +1,9 @@
-s/org.mortbay.jasper/org.apache.tomcat/ s/apache-jsp/tomcat-jasper/ * s/.*/11.x/ * *
+s/org.mortbay.jasper/org.apache.tomcat/ s/apache-jsp/tomcat-jasper/ * s/.*/10.x/ * *
+org.apache.tomcat tomcat-jasper * s/9.*/9.x/ * *
-s/jakarta.websocket/org.apache.tomcat/ s/jakarta.websocket-api/tomcat-websocket-api/ * s/.*/11.x/ * *
-s/jakarta.websocket/org.apache.tomcat/ s/jakarta.websocket-client-api/tomcat-websocket-client-api/ * s/.*/11.x/ * *
+s/jakarta.websocket/org.apache.tomcat/ s/jakarta.websocket-api/tomcat-websocket-api/ * s/.*/10.x/ * *
+s/jakarta.websocket/org.apache.tomcat/ s/jakarta.websocket-client-api/tomcat-websocket-client-api/ * s/.*/10.x/ * *
+s/jakarta.security.auth.message/org.apache.tomcat/ s/jakarta.security.auth.message-api/tomcat-jaspic-api/ * s/.*/9.x/ * *
org.apache.maven maven-* jar s/.*/3.x/ * *
@@ -11,9 +13,17 @@ s/org.eclipse.platform/org.eclipse.osgi/ org.eclipse.osgi * s/.*/debian
org.osgi s/.*/osgi.cmpn/ * s/.*/debian/ * *
org.slf4j * * s/.*/2.x/ * *
+s/org.eclipse.jetty.toolchain/javax.servlet/ s/jetty-servlet-api/javax.servlet-api/ * s/.*/debian/ * *
s/org.eclipse.jetty.toolchain/jakarta.servlet/ s/jetty-jakarta-servlet-api/jakarta.servlet-api/ * s/.*/debian/ * *
-s/org.eclipse.jetty.toolchain/org.apache.tomcat/ s/jetty-jakarta-websocket-api/tomcat-websocket-api/ * s/.*/11.x/ * *
+s/org.eclipse.jetty.toolchain/org.apache.tomcat/ s/jetty-jakarta-websocket-api/tomcat-websocket-api/ * s/.*/10.x/ * *
+s/org.eclipse.jetty.toolchain/org.apache.tomcat/ s/jetty-javax-websocket-api/tomcat-websocket-api/ * s/.*/9.x/ * *
+
+s/org.glassfish.web/org.apache.taglibs/ s/javax.servlet.jsp.jstl/taglibs-standard-impl/ * s/.*/debian/ * *
org.bouncycastle s/bcpkix-jdk15to18/bcpkix/ * s/.*/debian/ * *
org.bouncycastle s/bcprov-jdk15to18/bcprov/ * s/.*/debian/ * *
org.bouncycastle s/bcutil-jdk15to18/bcutil/ * s/.*/debian/ * *
+
+org.eclipse.jetty.toolchain jetty-modify-sources-maven-plugin * s/1.0.13/1.0.13/ * *
+
+s/org.eclipse.jetty.orbit/com.sun.mail/ s/javax.mail.glassfish/javax.mail/ * s/.*/debian/ * *
=====================================
debian/patches/09-tweak-distribution.patch
=====================================
@@ -174,23 +174,7 @@ Forwarded: not-needed
<configuration>
<includeGroupIds>org.eclipse.jetty,org.slf4j</includeGroupIds>
<includeArtifactIds>jetty-slf4j-impl,slf4j-api</includeArtifactIds>
-@@ -504,6 +506,7 @@
- <version>${project.version}</version>
- <type>zip</type>
- </artifactItem>
-+<!--
- <artifactItem>
- <groupId>org.eclipse.jetty.ee9</groupId>
- <artifactId>jetty-ee9-home</artifactId>
-@@ -516,6 +519,7 @@
- <version>${project.version}</version>
- <type>zip</type>
- </artifactItem>
-+-->
- </artifactItems>
- <outputDirectory>${assembly-directory}</outputDirectory>
- </configuration>
-@@ -525,7 +529,7 @@
+@@ -525,7 +527,7 @@
<goals>
<goal>unpack</goal>
</goals>
@@ -255,7 +239,7 @@ Forwarded: not-needed
- <version>${jakarta.websocket.api.version}</version>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-websocket-api</artifactId>
-+ <version>11.x</version>
++ <version>10.x</version>
</artifactItem>
</artifactItems>
<outputDirectory>${assembly-directory}/lib/ee9-websocket</outputDirectory>
@@ -326,3 +310,117 @@ Forwarded: not-needed
<configuration>
<artifactItems>
<artifactItem>
+--- a/jetty-ee8/jetty-ee8-home/pom.xml
++++ b/jetty-ee8/jetty-ee8-home/pom.xml
+@@ -222,7 +222,7 @@
+ <goals>
+ <goal>single</goal>
+ </goals>
+- <phase>package</phase>
++ <phase>none</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/jetty-source-assembly.xml</descriptor>
+@@ -254,7 +254,7 @@
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <includeGroupIds>jakarta.annotation,org.ow2.asm</includeGroupIds>
+ <includeArtifactIds>jakarta.annotation-api,asm,asm-commons,asm-tree,asm-analysis</includeArtifactIds>
+@@ -324,7 +324,7 @@
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <prependGroupId>true</prependGroupId>
+ <includeGroupIds>org.mortbay.jasper,org.eclipse.jdt</includeGroupIds>
+@@ -353,7 +353,7 @@
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <prependGroupId>true</prependGroupId>
+ <includeGroupIds>jakarta.servlet.jsp.jstl,org.glassfish.web</includeGroupIds>
+@@ -368,7 +368,7 @@
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.ee8</includeGroupIds>
+ <includeTypes>jar</includeTypes>
+@@ -385,7 +385,7 @@
+ <phase>generate-resources</phase>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+- <excludeArtifactIds>jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core*</excludeArtifactIds>
++ <excludeArtifactIds>jetty-schemas,javax.servlet-api,jetty-test-helper,jetty-websocket-core*</excludeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <outputDirectory>${assembly-directory}/lib</outputDirectory>
+ </configuration>
+@@ -395,7 +395,7 @@
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.websocket</includeGroupIds>
+ <includeTypes>jar</includeTypes>
+@@ -411,7 +411,7 @@
+ <phase>generate-resources</phase>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.toolchain,org.eclipse.jetty.ee8.websocket</includeGroupIds>
+- <excludeArtifactIds>jetty-schemas,jetty-servlet-api,jetty-test-helper,jetty-websocket-core*</excludeArtifactIds>
++ <excludeArtifactIds>jetty-schemas,javax.servlet-api,jetty-test-helper,jetty-websocket-core*</excludeArtifactIds>
+ <includeTypes>jar</includeTypes>
+ <outputDirectory>${assembly-directory}/lib/ee8-websocket</outputDirectory>
+ </configuration>
+@@ -421,7 +421,7 @@
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <includeGroupIds>org.eclipse.jetty.ee8.websocket</includeGroupIds>
+ <includeTypes>jar</includeTypes>
+@@ -438,9 +438,9 @@
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+- <groupId>org.eclipse.jetty.toolchain</groupId>
+- <artifactId>jetty-servlet-api</artifactId>
+- <version>${jetty.servlet.api.version}</version>
++ <groupId>javax.servlet</groupId>
++ <artifactId>javax.servlet-api</artifactId>
++ <version>debian</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${assembly-directory}/lib</outputDirectory>
+@@ -451,7 +451,7 @@
+ <goals>
+ <goal>copy</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+@@ -486,7 +486,7 @@
+ <goals>
+ <goal>copy</goal>
+ </goals>
+- <phase>generate-resources</phase>
++ <phase>none</phase>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
=====================================
debian/patches/16-jakarta-authentication-api-compatibility.patch
=====================================
@@ -3,22 +3,20 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/jetty-ee9/jetty-ee9-jaspi/src/main/java/org/eclipse/jetty/ee9/security/jaspi/DefaultAuthConfigFactory.java
+++ b/jetty-ee9/jetty-ee9-jaspi/src/main/java/org/eclipse/jetty/ee9/security/jaspi/DefaultAuthConfigFactory.java
-@@ -98,6 +98,18 @@
+@@ -97,6 +97,16 @@
+ return true;
}
- @Override
+ public String registerServerAuthModule(jakarta.security.auth.message.module.ServerAuthModule serverAuthModule, Object context)
+ {
+ throw new UnsupportedOperationException();
+ }
+
-+ @Override
+ public void removeServerAuthModule(Object context)
+ {
+ throw new UnsupportedOperationException();
+ }
+
-+ @Override
+ @Override
public String[] detachListener(RegistrationListener listener, String layer, String appContext)
{
- checkPermission();
=====================================
debian/patches/19-fix-jettyee8-javaee-dependencies.patch
=====================================
@@ -0,0 +1,51 @@
+Description: Replace some Java EE dependencies of the Jetty EE8 modules that can't be replaced by debian/maven.rules
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jetty-ee8/jetty-ee8-plus/pom.xml
++++ b/jetty-ee8/jetty-ee8-plus/pom.xml
+@@ -19,8 +19,9 @@
+
+ <dependencies>
+ <dependency>
+- <groupId>jakarta.transaction</groupId>
+- <artifactId>jakarta.transaction-api</artifactId>
++ <groupId>org.apache.geronimo.specs</groupId>
++ <artifactId>geronimo-jta_1.2_spec</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+--- a/jetty-ee8/jetty-ee8-annotations/pom.xml
++++ b/jetty-ee8/jetty-ee8-annotations/pom.xml
+@@ -18,8 +18,9 @@
+
+ <dependencies>
+ <dependency>
+- <groupId>jakarta.annotation</groupId>
+- <artifactId>jakarta.annotation-api</artifactId>
++ <groupId>org.apache.geronimo.specs</groupId>
++ <artifactId>geronimo-annotation_1.3_spec</artifactId>
++ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+--- a/jetty-ee8/jetty-ee8-apache-jsp/pom.xml
++++ b/jetty-ee8/jetty-ee8-apache-jsp/pom.xml
+@@ -26,14 +26,9 @@
+ <artifactId>jetty-servlet-api</artifactId>
+ </dependency>
+ <dependency>
+- <groupId>org.mortbay.jasper</groupId>
+- <artifactId>apache-jsp</artifactId>
+- <exclusions>
+- <exclusion>
+- <groupId>org.eclipse.jetty.toolchain</groupId>
+- <artifactId>jetty-schemas</artifactId>
+- </exclusion>
+- </exclusions>
++ <groupId>org.apache.tomcat</groupId>
++ <artifactId>tomcat-jasper</artifactId>
++ <version>9.x</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
=====================================
debian/patches/20-jetty-modules-classpath.patch
=====================================
@@ -0,0 +1,274 @@
+Description: Use versionless dependencies in the .mod files
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod
++++ b/jetty-ee8/jetty-ee8-annotations/src/main/config/modules/ee8-annotations.mod
+@@ -16,8 +16,8 @@
+
+ [lib]
+ lib/jetty-ee8-annotations-${jetty.version}.jar
+-lib/ee8-annotations/asm-${ee8.asm.version}.jar
+-lib/ee8-annotations/asm-analysis-${ee8.asm.version}.jar
+-lib/ee8-annotations/asm-commons-${ee8.asm.version}.jar
+-lib/ee8-annotations/asm-tree-${ee8.asm.version}.jar
+-lib/ee8-annotations/jakarta.annotation-api-${ee8.jakarta.annotation.api.version}.jar
++lib/ee8-annotations/asm.jar
++lib/ee8-annotations/asm-analysis.jar
++lib/ee8-annotations/asm-commons.jar
++lib/ee8-annotations/asm-tree.jar
++lib/ee8-annotations/javax.annotation-api.jar
+--- a/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
++++ b/jetty-ee9/jetty-ee9-annotations/src/main/config/modules/ee9-annotations.mod
+@@ -15,8 +15,8 @@
+
+ [lib]
+ lib/jetty-ee9-annotations-${jetty.version}.jar
+-lib/ee9-annotations/asm-${ee9.asm.version}.jar
+-lib/ee9-annotations/asm-analysis-${ee9.asm.version}.jar
+-lib/ee9-annotations/asm-commons-${ee9.asm.version}.jar
+-lib/ee9-annotations/asm-tree-${ee9.asm.version}.jar
+-lib/ee9-annotations/jakarta.annotation-api-${ee9.jakarta.annotation.api.version}.jar
++lib/ee9-annotations/asm.jar
++lib/ee9-annotations/asm-analysis.jar
++lib/ee9-annotations/asm-commons.jar
++lib/ee9-annotations/asm-tree.jar
++lib/ee9-annotations/jakarta.annotation-api.jar
+--- a/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
++++ b/jetty-ee10/jetty-ee10-annotations/src/main/config/modules/ee10-annotations.mod
+@@ -15,8 +15,8 @@
+
+ [lib]
+ lib/jetty-ee10-annotations-${jetty.version}.jar
+-lib/ee10-annotations/asm-${ee10.asm.version}.jar
+-lib/ee10-annotations/asm-analysis-${ee10.asm.version}.jar
+-lib/ee10-annotations/asm-commons-${ee10.asm.version}.jar
+-lib/ee10-annotations/asm-tree-${ee10.asm.version}.jar
+-lib/ee10-annotations/jakarta.annotation-api-${ee10.jakarta.annotation.api.version}.jar
++lib/ee10-annotations/asm.jar
++lib/ee10-annotations/asm-analysis.jar
++lib/ee10-annotations/asm-commons.jar
++lib/ee10-annotations/asm-tree.jar
++lib/ee10-annotations/jakarta.annotation-api.jar
+--- a/jetty-ee8/jetty-ee8-plus/src/main/config/modules/ee8-plus.mod
++++ b/jetty-ee8/jetty-ee8-plus/src/main/config/modules/ee8-plus.mod
+@@ -13,4 +13,4 @@
+
+ [lib]
+ lib/jetty-ee8-plus-${jetty.version}.jar
+-lib/jakarta.transaction-api- at jakarta.transaction-api.version@.jar
++lib/javax.transaction-api.jar
+--- a/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
++++ b/jetty-ee9/jetty-ee9-plus/src/main/config/modules/ee9-plus.mod
+@@ -13,8 +13,8 @@
+
+ [lib]
+ lib/jetty-ee9-plus-${jetty.version}.jar
+-lib/jakarta.transaction-api- at jakarta.transaction-api.version@.jar
+-lib/jakarta.interceptor-api- at jakarta.interceptor.api.version@.jar
+-lib/jakarta.enterprise.cdi-api- at jakarta.enterprise.cdi.api.version@.jar
+-lib/jakarta.inject-api- at jakarta.inject.api.version@.jar
+-lib/jakarta.enterprise.lang-model- at jakarta.enterprise.lang.model.version@.jar
++lib/jakarta.transaction-api.jar
++lib/jakarta.interceptor-api.jar
++lib/jakarta.enterprise.cdi-api.jar
++lib/jakarta.inject-api.jar
++lib/jakarta.enterprise.lang-model.jar
+--- a/jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
++++ b/jetty-ee10/jetty-ee10-plus/src/main/config/modules/ee10-plus.mod
+@@ -13,8 +13,8 @@
+
+ [lib]
+ lib/jetty-ee10-plus-${jetty.version}.jar
+-lib/jakarta.transaction-api- at jakarta.transaction-api.version@.jar
+-lib/jakarta.interceptor-api- at jakarta.interceptor.api.version@.jar
+-lib/jakarta.enterprise.cdi-api- at jakarta.enterprise.cdi.api.version@.jar
+-lib/jakarta.inject-api- at jakarta.inject.api.version@.jar
+-lib/jakarta.enterprise.lang-model- at jakarta.enterprise.lang.model.version@.jar
++lib/jakarta.transaction-api.jar
++lib/jakarta.interceptor-api.jar
++lib/jakarta.enterprise.cdi-api.jar
++lib/jakarta.inject-api.jar
++lib/jakarta.enterprise.lang-model.jar
+--- a/jetty-home/src/main/resources/modules/logging/slf4j.mod
++++ b/jetty-home/src/main/resources/modules/logging/slf4j.mod
+@@ -12,7 +12,7 @@
+ slf4j
+
+ [lib]
+-lib/logging/slf4j-api-${slf4j.version}.jar
++lib/logging/slf4j-api.jar
+
+ [ini]
+ slf4j.version?=@slf4j.version@
+--- a/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod
++++ b/jetty-ee9/jetty-ee9-jaspi/src/main/config/modules/ee9-jaspi.mod
+@@ -15,7 +15,7 @@
+
+ [lib]
+ lib/jetty-ee9-jaspi-${jetty.version}.jar
+-lib/ee9-jaspi/jakarta.authentication-api-${ee9.jakarta.authentication.api.version}.jar
++lib/ee9-jaspi/jakarta.authentication-api.jar
+
+ [xml]
+ etc/jaspi/jetty-ee9-jaspi-authmoduleconfig.xml
+--- a/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
++++ b/jetty-ee10/jetty-ee10-jaspi/src/main/config/modules/ee10-jaspi.mod
+@@ -18,7 +18,7 @@
+
+ [lib]
+ lib/jetty-ee10-jaspi-${jetty.version}.jar
+-lib/ee10-jaspi/jakarta.authentication-api-${ee10.jakarta.authentication.api.version}.jar
++lib/ee10-jaspi/jakarta.authentication-api.jar
+
+ [xml]
+ etc/jaspi/jetty-ee10-jaspi-authmoduleconfig.xml
+--- a/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
++++ b/jetty-ee8/jetty-ee8-servlet/src/main/config/modules/ee8-servlet.mod
+@@ -11,6 +11,6 @@
+ sessions
+
+ [lib]
+-lib/jetty-servlet-api- at jetty.servlet.api.version@.jar
++lib/javax.servlet-api.jar
+ lib/jetty-ee8-nested-${jetty.version}.jar
+ lib/jetty-ee8-servlet-${jetty.version}.jar
+--- a/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
++++ b/jetty-ee9/jetty-ee9-servlet/src/main/config/modules/ee9-servlet.mod
+@@ -12,6 +12,6 @@
+
+ # FIXME should servlet api version be interpolated
+ [lib]
+-lib/jetty-jakarta-servlet-api- at jetty.servlet.api.version@.jar
++lib/jakarta.servlet-api.jar
+ lib/jetty-ee9-nested-${jetty.version}.jar
+ lib/jetty-ee9-servlet-${jetty.version}.jar
+--- a/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
++++ b/jetty-ee10/jetty-ee10-servlet/src/main/config/modules/ee10-servlet.mod
+@@ -11,5 +11,5 @@
+ sessions
+
+ [lib]
+-lib/jakarta.servlet-api- at jakarta.servlet.api.version@.jar
++lib/jakarta.servlet-api.jar
+ lib/jetty-ee10-servlet-${jetty.version}.jar
+--- a/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod
++++ b/jetty-ee8/jetty-ee8-websocket/jetty-ee8-websocket-javax-server/src/main/config/modules/ee8-websocket-javax.mod
+@@ -14,7 +14,7 @@
+
+ [lib]
+ lib/ee8-websocket/jetty-ee8-websocket-servlet-${jetty.version}.jar
+-lib/ee8-websocket/jetty-javax-websocket-api- at jakarta.websocket.api.version@.jar
++lib/ee8-websocket/jetty-javax-websocket-api.jar
+ lib/ee8-websocket/jetty-ee8-websocket-javax-client-${jetty.version}.jar
+ lib/ee8-websocket/jetty-ee8-websocket-javax-common-${jetty.version}.jar
+ lib/ee8-websocket/jetty-ee8-websocket-javax-server-${jetty.version}.jar
+--- a/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod
++++ b/jetty-ee9/jetty-ee9-websocket/jetty-ee9-websocket-jakarta-server/src/main/config/modules/ee9-websocket-jakarta.mod
+@@ -14,7 +14,7 @@
+
+ [lib]
+ lib/ee9-websocket/jetty-ee9-websocket-servlet-${jetty.version}.jar
+-lib/ee9-websocket/jetty-jakarta-websocket-api- at jakarta.websocket.api.version@.jar
++lib/ee9-websocket/jetty-jakarta-websocket-api.jar
+ lib/ee9-websocket/jetty-ee9-websocket-jakarta-client-${jetty.version}.jar
+ lib/ee9-websocket/jetty-ee9-websocket-jakarta-common-${jetty.version}.jar
+ lib/ee9-websocket/jetty-ee9-websocket-jakarta-server-${jetty.version}.jar
+--- a/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
++++ b/jetty-ee8/jetty-ee8-apache-jsp/src/main/config/modules/ee8-apache-jsp.mod
+@@ -15,7 +15,11 @@
+ ee8.jsp.impl.version?=@jsp.impl.version@
+
+ [lib]
+-lib/ee8-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
+-lib/ee8-apache-jsp/org.mortbay.jasper.apache-el-${ee8.jsp.impl.version}.jar
+-lib/ee8-apache-jsp/org.mortbay.jasper.apache-jsp-${ee8.jsp.impl.version}.jar
++lib/ee8-apache-jsp/org.eclipse.jdt.ecj.jar
++lib/ee8-apache-jsp/org.mortbay.jasper.apache-el.jar
++lib/ee8-apache-jsp/org.mortbay.jasper.apache-jsp.jar
+ lib/jetty-ee8-apache-jsp-${jetty.version}.jar
++/usr/share/java/tomcat9-api.jar
++/usr/share/java/tomcat9-juli.jar
++/usr/share/java/tomcat9-util.jar
++/usr/share/java/tomcat9-util-scan.jar
+--- a/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
++++ b/jetty-ee10/jetty-ee10-websocket/jetty-ee10-websocket-jakarta-server/src/main/config/modules/ee10-websocket-jakarta.mod
+@@ -14,8 +14,8 @@
+
+ [lib]
+ lib/ee10-websocket/jetty-ee10-websocket-servlet-${jetty.version}.jar
+-lib/ee10-websocket/jakarta.websocket-client-api- at jakarta.websocket.api.version@.jar
+-lib/ee10-websocket/jakarta.websocket-api- at jakarta.websocket.api.version@.jar
++lib/ee10-websocket/jakarta.websocket-client-api.jar
++lib/ee10-websocket/jakarta.websocket-api.jar
+ lib/ee10-websocket/jetty-ee10-websocket-jakarta-client-${jetty.version}.jar
+ lib/ee10-websocket/jetty-ee10-websocket-jakarta-common-${jetty.version}.jar
+ lib/ee10-websocket/jetty-ee10-websocket-jakarta-server-${jetty.version}.jar
+--- a/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
++++ b/jetty-ee9/jetty-ee9-apache-jsp/src/main/config/modules/ee9-apache-jsp.mod
+@@ -15,7 +15,11 @@
+ ee9.jsp.impl.version?=@jsp.impl.version@
+
+ [lib]
+-lib/ee9-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
+-lib/ee9-apache-jsp/org.mortbay.jasper.apache-el-${ee9.jsp.impl.version}.jar
+-lib/ee9-apache-jsp/org.mortbay.jasper.apache-jsp-${ee9.jsp.impl.version}.jar
++lib/ee9-apache-jsp/org.eclipse.jdt.ecj.jar
++lib/ee9-apache-jsp/org.mortbay.jasper.apache-el.jar
++lib/ee9-apache-jsp/org.mortbay.jasper.apache-jsp.jar
+ lib/jetty-ee9-apache-jsp-${jetty.version}.jar
++/usr/share/java/tomcat10-api.jar
++/usr/share/java/tomcat10-juli.jar
++/usr/share/java/tomcat10-util.jar
++/usr/share/java/tomcat10-util-scan.jar
+--- a/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
++++ b/jetty-ee10/jetty-ee10-apache-jsp/src/main/config/modules/ee10-apache-jsp.mod
+@@ -17,10 +17,14 @@
+ ee10.jsp.impl.version?=@jsp.impl.version@
+
+ [lib]
+-lib/ee10-apache-jsp/jakarta.el.jakarta.el-api-${ee10.jakarta.el.api.version}.jar
+-lib/ee10-apache-jsp/jakarta.servlet.jsp.jakarta.servlet.jsp-api-${ee10.jakarta.servlet.jsp.api.version}.jar
+-lib/ee10-apache-jsp/org.eclipse.jdt.ecj-${eclipse.jdt.ecj.version}.jar
+-lib/ee10-apache-jsp/org.mortbay.jasper.apache-el-${ee10.jsp.impl.version}.jar
+-lib/ee10-apache-jsp/org.mortbay.jasper.apache-jsp-${ee10.jsp.impl.version}.jar
++lib/ee10-apache-jsp/jakarta.el-api.jar
++lib/ee10-apache-jsp/jakarta.servlet.jsp-api.jar
++lib/ee10-apache-jsp/org.eclipse.jdt.ecj.jar
++lib/ee10-apache-jsp/org.mortbay.jasper.apache-el.jar
++lib/ee10-apache-jsp/org.mortbay.jasper.apache-jsp.jar
+ lib/jetty-ee10-apache-jsp-${jetty.version}.jar
++/usr/share/java/tomcat10-api.jar
++/usr/share/java/tomcat10-juli.jar
++/usr/share/java/tomcat10-util.jar
++/usr/share/java/tomcat10-util-scan.jar
+
+--- a/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod
++++ b/jetty-ee8/jetty-ee8-glassfish-jstl/src/main/config/modules/ee8-glassfish-jstl.mod
+@@ -11,5 +11,5 @@
+ ee8.javax.servlet.jsp.jstl.impl.version?=@javax.servlet.jsp.jstl.impl.version@
+
+ [lib]
+-lib/ee8-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee8.jakarta.servlet.jsp.jstl.api.version}.jar
+-lib/ee8-glassfish-jstl/org.glassfish.web.javax.servlet.jsp.jstl-${ee8.javax.servlet.jsp.jstl.impl.version}.jar
++lib/ee8-glassfish-jstl/javax.servlet.jsp.jstl-api.jar
++lib/ee8-glassfish-jstl/javax.servlet.jsp.jstl-impl.jar
+--- a/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod
++++ b/jetty-ee9/jetty-ee9-glassfish-jstl/src/main/config/modules/ee9-glassfish-jstl.mod
+@@ -11,5 +11,5 @@
+ ee9.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.version@
+
+ [lib]
+-lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee9.jakarta.servlet.jsp.jstl.api.version}.jar
+-lib/ee9-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee9.jakarta.servlet.jsp.jstl.impl.version}.jar
++lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl-api.jar
++lib/ee9-glassfish-jstl/jakarta.servlet.jsp.jstl-impl.jar
+--- a/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
++++ b/jetty-ee10/jetty-ee10-glassfish-jstl/src/main/config/modules/ee10-glassfish-jstl.mod
+@@ -14,5 +14,5 @@
+ ee10.jakarta.servlet.jsp.jstl.impl.version?=@jakarta.servlet.jsp.jstl.impl.version@
+
+ [lib]
+-lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl.jakarta.servlet.jsp.jstl-api-${ee10.jakarta.servlet.jsp.jstl.api.version}.jar
+-lib/ee10-glassfish-jstl/org.glassfish.web.jakarta.servlet.jsp.jstl-${ee10.jakarta.servlet.jsp.jstl.impl.version}.jar
++lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl-api.jar
++lib/ee10-glassfish-jstl/jakarta.servlet.jsp.jstl-impl.jar
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,5 @@
16-jakarta-authentication-api-compatibility.patch
17-jakarta-websocket-api-compatibility.patch
18-ignore-mimir-extension.patch
+19-fix-jettyee8-javaee-dependencies.patch
+20-jetty-modules-classpath.patch
=====================================
debian/rules
=====================================
@@ -3,6 +3,12 @@
%:
dh $@ --with javahelper
+override_dh_auto_build:
+ dh_auto_build
+
+ # Rename the shaded start.jar to be installed in /usr/share/jetty12
+ cp jetty-core/jetty-start/target/jetty-start-*shaded.jar jetty-core/jetty-start/target/start.jar
+
override_dh_auto_test:
override_dh_link:
=====================================
debian/start.ini
=====================================
@@ -9,7 +9,30 @@
#
#------------------------------------------------------------------------------
---module=deploy,http,jsp,jstl,websocket,ext,resources
+--module=server
+--module=http
+--module=ext
+--module=resources
+--module=console-capture
+
+--module=ee8-deploy
+--module=ee8-servlet
+--module=ee8-jsp
+--module=ee8-jstl
+--module=ee8-websocket-javax
+
+--module=ee9-deploy
+--module=ee9-servlet
+--module=ee9-jsp
+--module=ee9-jstl
+--module=ee9-websocket-jakarta
+
+--module=ee10-deploy
+--module=ee10-servlet
+--module=ee10-jsp
+--module=ee10-jstl
+--module=ee10-websocket-jakarta
+
##
## HTTP Connector Configuration
=====================================
debian/sysusers/jetty12.conf
=====================================
@@ -0,0 +1,7 @@
+#
+# sysusers.d snippet for creating the jetty user automatically
+# at install time. See sysusers.d(5) for details.
+#
+
+#Type Name ID GECOS Home directory Shell
+u jetty - "Jetty" /var/lib/jetty /usr/sbin/nologin
View it on GitLab: https://salsa.debian.org/java-team/jetty12/-/compare/294d0cf3a82c237e98baeaa821d2e7a388b0c11a...6ebfbf853f1f6b681dea46052eb07a3c5bbcaf25
--
View it on GitLab: https://salsa.debian.org/java-team/jetty12/-/compare/294d0cf3a82c237e98baeaa821d2e7a388b0c11a...6ebfbf853f1f6b681dea46052eb07a3c5bbcaf25
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260226/af3ec3b7/attachment.htm>
More information about the pkg-java-commits
mailing list