Emmanuel Bourg pushed to branch master at Debian Java Maintainers / jetty12


Commits:
8d137dfb by Emmanuel Bourg at 2026-10-28T18:09:19+01:00
Removed the unused dependency on Spring

- - - - -
d1ee8895 by Emmanuel Bourg at 2026-10-29T10:27:40+01:00
Added the missing Tomcat jars to the classpath of the JSP modules, lost in 
12.0.39 (Closes: #1152432)

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/20-jetty-modules-classpath.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jetty12 (12.0.40-2) unstable; urgency=medium
+
+  * Added the missing Tomcat jars to the classpath of the JSP modules,
+    lost in 12.0.39 (Closes: #1152432)
+  * Removed the unused dependency on Spring
+
+ -- Emmanuel Bourg <[email protected]>  Wed, 28 Oct 2026 18:09:19 +0100
+
 jetty12 (12.0.40-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -40,13 +40,13 @@ Build-Depends:
  libmaven-assembly-plugin-java,
  libmaven-bundle-plugin-java,
  libmaven-dependency-plugin-java,
+ libmaven-plugin-tools-java,
  libmaven-shade-plugin-java,
  libmockito-java,
  libnetty-java,
  libplexus-xml-java,
  libservlet-api-java,
  libslf4j2-java,
- libspring-beans-java,
  libtaglibs-standard-impl-java,
  libtaglibs-standard-spec-java,
  libtomcat9-java,
@@ -98,7 +98,6 @@ Depends:
  libjetty12-java (>= ${source:Version}),
  libjnr-unixsocket-java,
  libmail-java,
- libspring-beans-java,
  libwebsocket-api-java,
  ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}


=====================================
debian/patches/20-jetty-modules-classpath.patch
=====================================
@@ -175,7 +175,7 @@ Forwarded: not-needed
  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,10 @@
+@@ -15,7 +15,11 @@
  [email protected]@
  
  [lib]
@@ -189,6 +189,7 @@ Forwarded: not-needed
 +/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 @@
@@ -204,7 +205,7 @@ Forwarded: not-needed
  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,10 @@
+@@ -15,7 +15,11 @@
  [email protected]@
  
  [lib]
@@ -218,9 +219,10 @@ Forwarded: not-needed
 +/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,10 @@
+@@ -17,10 +17,14 @@
  [email protected]@
  
  [lib]
@@ -235,6 +237,10 @@ Forwarded: not-needed
 +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



View it on GitLab: 
https://salsa.debian.org/java-team/jetty12/-/compare/5a8d79e17bcab8cfa59d195ef0314f7c3b6a8686...d1ee889594dbdc9b430e4140aef0bdf8c5405662

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/jetty12/-/compare/5a8d79e17bcab8cfa59d195ef0314f7c3b6a8686...d1ee889594dbdc9b430e4140aef0bdf8c5405662
You're receiving this email because of your account on salsa.debian.org. Manage 
all notifications: https://salsa.debian.org/-/profile/notifications | Help: 
https://salsa.debian.org/help


_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to