Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: a...@debian.org
Please unblock package jetty9 [ Reason ] It was discovered that jetty9 would throw a ServiceConfigurationError when running web applications. (#1036798) We couldn't find a targeted fix to improve our tomcat10-migration.patch from the previous upload. Time is running out hence why I have reverted back to libtomcat9-java. [ Impact ] Web applications will not work when using the jetty9 server package. [ Tests ] Confirmed that reverting back to libtomcat9-java fixes the problem. [ Risks ] We are back to square one. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing unblock jetty9/9.4.50-4
diff -Nru jetty9-9.4.50/debian/changelog jetty9-9.4.50/debian/changelog --- jetty9-9.4.50/debian/changelog 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/changelog 2023-05-27 16:28:19.000000000 +0200 @@ -1,3 +1,11 @@ +jetty9 (9.4.50-4) unstable; urgency=medium + + * Team upload. + * Revert the switch to libtomcat10-java. For now Jetty 9 only works correctly + with libtomcat9-java. (Closes: #1036798) + + -- Markus Koschany <a...@debian.org> Sat, 27 May 2023 16:28:19 +0200 + jetty9 (9.4.50-3) unstable; urgency=medium * Team upload. diff -Nru jetty9-9.4.50/debian/control jetty9-9.4.50/debian/control --- jetty9-9.4.50/debian/control 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/control 2023-05-27 16:28:19.000000000 +0200 @@ -29,7 +29,7 @@ libspring-beans-java, libtaglibs-standard-impl-java, libtaglibs-standard-spec-java, - libtomcat10-java, + libtomcat9-java, libwebsocket-api-java, maven-debian-helper (>= 2.2.8~), maven-repo-helper @@ -60,7 +60,7 @@ libspring-beans-java, libtaglibs-standard-impl-java, libtaglibs-standard-spec-java, - libtomcat10-java, + libtomcat9-java, ${misc:Depends} Suggests: jetty9 Description: Java servlet engine and webserver -- extra libraries diff -Nru jetty9-9.4.50/debian/jetty9.links jetty9-9.4.50/debian/jetty9.links --- jetty9-9.4.50/debian/jetty9.links 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/jetty9.links 2023-05-27 16:28:19.000000000 +0200 @@ -50,22 +50,22 @@ usr/share/java/jetty9-xml.jar usr/share/jetty9/lib/jetty-xml-${VERSION}.jar usr/share/java/servlet-api.jar usr/share/jetty9/lib/servlet-api-3.1.jar -usr/share/java/tomcat10-annotations-api.jar usr/share/jetty9/lib/annotations/javax.annotation.jar +usr/share/java/tomcat9-annotations-api.jar usr/share/jetty9/lib/annotations/javax.annotation.jar usr/share/java/asm.jar usr/share/jetty9/lib/annotations/asm.jar usr/share/java/asm-analysis.jar usr/share/jetty9/lib/annotations/asm-analysis.jar usr/share/java/asm-commons.jar usr/share/jetty9/lib/annotations/asm-commons.jar usr/share/java/asm-tree.jar usr/share/jetty9/lib/annotations/asm-tree.jar usr/share/java/eclipse-jdt-core.jar usr/share/jetty9/lib/apache-jsp/jdt-core.jar -usr/share/java/tomcat10-api.jar usr/share/jetty9/lib/apache-jsp/tomcat-api.jar -usr/share/java/tomcat10-el-api.jar usr/share/jetty9/lib/apache-jsp/tomcat-el-api.jar -usr/share/java/tomcat10-jasper.jar usr/share/jetty9/lib/apache-jsp/tomcat-jasper.jar -usr/share/java/tomcat10-jasper-el.jar usr/share/jetty9/lib/apache-jsp/tomcat-jasper-el.jar -usr/share/java/tomcat10-jsp-api.jar usr/share/jetty9/lib/apache-jsp/tomcat-jsp-api.jar -usr/share/java/tomcat10-juli.jar usr/share/jetty9/lib/apache-jsp/tomcat-juli.jar -usr/share/java/tomcat10-util.jar usr/share/jetty9/lib/apache-jsp/tomcat-util.jar -usr/share/java/tomcat10-util-scan.jar usr/share/jetty9/lib/apache-jsp/tomcat-util-scan.jar +usr/share/java/tomcat9-api.jar usr/share/jetty9/lib/apache-jsp/tomcat-api.jar +usr/share/java/tomcat9-el-api.jar usr/share/jetty9/lib/apache-jsp/tomcat-el-api.jar +usr/share/java/tomcat9-jasper.jar usr/share/jetty9/lib/apache-jsp/tomcat-jasper.jar +usr/share/java/tomcat9-jasper-el.jar usr/share/jetty9/lib/apache-jsp/tomcat-jasper-el.jar +usr/share/java/tomcat9-jsp-api.jar usr/share/jetty9/lib/apache-jsp/tomcat-jsp-api.jar +usr/share/java/tomcat9-juli.jar usr/share/jetty9/lib/apache-jsp/tomcat-juli.jar +usr/share/java/tomcat9-util.jar usr/share/jetty9/lib/apache-jsp/tomcat-util.jar +usr/share/java/tomcat9-util-scan.jar usr/share/jetty9/lib/apache-jsp/tomcat-util-scan.jar usr/share/java/taglibs-standard-spec.jar usr/share/jetty9/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec.jar usr/share/java/taglibs-standard-impl.jar usr/share/jetty9/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl.jar -usr/share/java/tomcat10-jaspic-api.jar usr/share/jetty9/lib/jaspi/javax.security.auth.message.jar +usr/share/java/tomcat9-jaspic-api.jar usr/share/jetty9/lib/jaspi/javax.security.auth.message.jar usr/share/java/javax.mail.jar usr/share/jetty9/lib/mail/javax.mail.jar -usr/share/java/tomcat10-websocket-api.jar usr/share/jetty9/lib/websocket/javax.websocket-api-1.0.jar +usr/share/java/tomcat9-websocket-api.jar usr/share/jetty9/lib/websocket/javax.websocket-api-1.0.jar diff -Nru jetty9-9.4.50/debian/libjetty9-java.poms jetty9-9.4.50/debian/libjetty9-java.poms --- jetty9-9.4.50/debian/libjetty9-java.poms 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/libjetty9-java.poms 2023-05-27 16:28:19.000000000 +0200 @@ -69,7 +69,7 @@ jetty-fcgi/pom.xml --package=libjetty9-extra-java jetty-fcgi/fcgi-client/pom.xml --java-lib --usj-name=jetty9-fcgi-client --package=libjetty9-extra-java jetty-fcgi/fcgi-server/pom.xml --java-lib --usj-name=jetty9-fcgi-server --package=libjetty9-extra-java -jetty-jaspi/pom.xml --ignore --java-lib --usj-name=jetty9-jaspi --package=libjetty9-extra-java +jetty-jaspi/pom.xml --java-lib --usj-name=jetty9-jaspi --package=libjetty9-extra-java jetty-jndi/pom.xml --java-lib --usj-name=jetty9-jndi --package=libjetty9-extra-java jetty-openid/pom.xml --java-lib --usj-name=jetty9-openid --package=libjetty9-extra-java jetty-plus/pom.xml --java-lib --usj-name=jetty9-plus --package=libjetty9-extra-java diff -Nru jetty9-9.4.50/debian/maven.ignoreRules jetty9-9.4.50/debian/maven.ignoreRules --- jetty9-9.4.50/debian/maven.ignoreRules 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/maven.ignoreRules 2023-05-27 16:28:19.000000000 +0200 @@ -52,5 +52,3 @@ org.infinispan infinispan-bom pom * * * org.testcontainers testcontainers-bom pom * * * - -org.eclipse.jetty jetty-jaspi * * * * diff -Nru jetty9-9.4.50/debian/maven.rules jetty9-9.4.50/debian/maven.rules --- jetty9-9.4.50/debian/maven.rules 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/maven.rules 2023-05-27 16:28:19.000000000 +0200 @@ -1,13 +1,13 @@ javax.websocket s/javax.websocket-client-api/javax.websocket-api/ * s/.*/1.0/ * * -s/javax.annotation/org.apache.tomcat/ s/javax.annotation-api/tomcat-annotations-api/ * s/.*/10.x/ * * +s/javax.annotation/org.apache.tomcat/ s/javax.annotation-api/tomcat-annotations-api/ * s/.*/9.x/ * * s/javax.transaction/org.apache.geronimo.specs/ s/javax.transaction-api/geronimo-jta_1.2_spec/ * s/.*/debian/ * * junit junit * s/4\..*/4.x/ * * org.apache.felix maven-bundle-plugin * s/.*/2.3.5/ * * s/org.eclipse.jetty.orbit/com.sun.mail/ s/javax.mail.glassfish/javax.mail/ jar s/.*/debian/ * * -s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.security.auth.message/tomcat-jaspic-api/ jar s/.*/10.x/ * * +s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/javax.security.auth.message/tomcat-jaspic-api/ jar s/.*/9.x/ * * s/org.eclipse.jetty.orbit/org.apache.tomcat/ s/org.apache.jasper.glassfish/tomcat-jasper/ jar s/.*/debian/ * * -s/org.mortbay.jasper/org.apache.tomcat/ s/apache-jsp/tomcat-jasper/ * s/.*/10.x/ * * +s/org.mortbay.jasper/org.apache.tomcat/ s/apache-jsp/tomcat-jasper/ * s/.*/9.x/ * * org.eclipse.jetty.alpn alpn-api * s/.*/1.1.2.v20150522/ * * org.eclipse.jetty jetty-* * s/.*/9.x/ * * diff -Nru jetty9-9.4.50/debian/patches/series jetty9-9.4.50/debian/patches/series --- jetty9-9.4.50/debian/patches/series 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/patches/series 2023-05-27 16:28:19.000000000 +0200 @@ -6,4 +6,3 @@ 08-ignore-jetty-test-policy.patch 09-tweak-distribution.patch servlet-api.patch -tomcat10-migration.patch diff -Nru jetty9-9.4.50/debian/patches/tomcat10-migration.patch jetty9-9.4.50/debian/patches/tomcat10-migration.patch --- jetty9-9.4.50/debian/patches/tomcat10-migration.patch 2023-02-19 13:41:00.000000000 +0100 +++ jetty9-9.4.50/debian/patches/tomcat10-migration.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,95 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Sun, 19 Feb 2023 02:49:28 +0100 -Subject: tomcat10 migration - -FIXME: Support jetty-jaspi module - -Forwarded: no ---- - .../org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java | 2 +- - .../java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java | 2 +- - .../src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java | 10 +++++----- - .../jetty/annotations/DeclareRolesAnnotationHandler.java | 2 +- - .../org/eclipse/jetty/annotations/RunAsAnnotationHandler.java | 2 +- - 5 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java -index 7fae6d8..456d675 100644 ---- a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java -+++ b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java -@@ -23,7 +23,7 @@ import java.net.URL; - import java.util.Collection; - import java.util.Collections; - import java.util.List; --import javax.servlet.ServletContext; -+import jakarta.servlet.ServletContext; - - import org.apache.jasper.servlet.JasperInitializer; - import org.apache.jasper.servlet.TldScanner; -diff --git a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java -index d3367ef..53286ce 100644 ---- a/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java -+++ b/apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java -@@ -20,7 +20,7 @@ package org.eclipse.jetty.apache.jsp; - - import java.net.URL; - import java.util.Collection; --import javax.servlet.ServletContext; -+import jakarta.servlet.ServletContext; - - import org.apache.jasper.servlet.TldPreScanned; - import org.apache.tomcat.util.descriptor.tld.TldResourcePath; -diff --git a/apache-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java b/apache-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java -index f3ddf9d..beee9f2 100644 ---- a/apache-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java -+++ b/apache-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java -@@ -22,10 +22,10 @@ import java.io.IOException; - import java.nio.file.Files; - import java.nio.file.Path; - import java.nio.file.Paths; --import javax.servlet.RequestDispatcher; --import javax.servlet.ServletException; --import javax.servlet.http.HttpServletRequest; --import javax.servlet.http.HttpServletResponse; -+import jakarta.servlet.RequestDispatcher; -+import jakarta.servlet.ServletException; -+import jakarta.servlet.http.HttpServletRequest; -+import jakarta.servlet.http.HttpServletResponse; - - import org.apache.jasper.servlet.JspServlet; - -@@ -49,7 +49,7 @@ public class JettyJspServlet extends JspServlet - { - HttpServletRequest request = null; - if (req instanceof HttpServletRequest) -- request = req; -+ request = (HttpServletRequest)req; - else - throw new ServletException("Request not HttpServletRequest"); - -diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java -index e917f96..9643b5f 100644 ---- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java -+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/DeclareRolesAnnotationHandler.java -@@ -18,7 +18,7 @@ - - package org.eclipse.jetty.annotations; - --import javax.annotation.security.DeclareRoles; -+import jakarta.annotation.security.DeclareRoles; - import javax.servlet.Servlet; - - import org.eclipse.jetty.annotations.AnnotationIntrospector.AbstractIntrospectableAnnotationHandler; -diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java -index 8f57316..885e5ac 100644 ---- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java -+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/RunAsAnnotationHandler.java -@@ -48,7 +48,7 @@ public class RunAsAnnotationHandler extends AbstractIntrospectableAnnotationHand - if (!Servlet.class.isAssignableFrom(clazz)) - return; - -- javax.annotation.security.RunAs runAs = (javax.annotation.security.RunAs)clazz.getAnnotation(javax.annotation.security.RunAs.class); -+ jakarta.annotation.security.RunAs runAs = (jakarta.annotation.security.RunAs)clazz.getAnnotation(jakarta.annotation.security.RunAs.class); - if (runAs != null) - { - String role = runAs.value();