[Git][java-team/eclipse-equinox][master] Depend on libtomcat10-java instead of libtomcat9-java

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / eclipse-equinox


Commits:
d8a65af4 by Emmanuel Bourg at 2023-02-10T01:11:10+01:00
Depend on libtomcat10-java instead of libtomcat9-java

- - - - -


5 changed files:

- debian/build.xml
- debian/changelog
- debian/control
- + debian/patches/04-tomcat10-compatibility.patch
- debian/patches/series


Changes:

=====================================
debian/build.xml
=====================================
@@ -113,7 +113,7 @@
   <!-- Equinox Jasper Jsp Support Bundle -->
   <target name="org.eclipse.equinox.jsp.jasper">
     <make-bundle name="org.eclipse.equinox.jsp.jasper">
-      <pathelement path="/usr/share/java/tomcat9-jasper.jar"/>
+      <pathelement path="/usr/share/java/tomcat10-jasper.jar"/>
     </make-bundle>
   </target>
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+eclipse-equinox (4.26-4) unstable; urgency=medium
+
+  * Depend on libtomcat10-java instead of libtomcat9-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 10 Feb 2023 01:11:04 +0100
+
 eclipse-equinox (4.26-3) unstable; urgency=medium
 
   * Explicit dependency on libosgi-compendium-java


=====================================
debian/control
=====================================
@@ -23,7 +23,7 @@ Build-Depends:
  libosgi-compendium-java,
  libservlet-api-java,
  libswt-gtk-4-java (>= 4.22),
- libtomcat9-java,
+ libtomcat10-java,
  xmlstarlet
 Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/java-team/eclipse-equinox.git
@@ -203,7 +203,7 @@ Description: Eclipse Equinox Servletbridge HTTP Service
 
 Package: libequinox-jsp-jasper-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}, libtomcat9-java
+Depends: ${misc:Depends}, ${bundle:Depends}, libtomcat10-java
 Description: Eclipse Equinox Jasper Jsp Support Bundle
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi


=====================================
debian/patches/04-tomcat10-compatibility.patch
=====================================
@@ -0,0 +1,26 @@
+Description: Fixes the compatibility with Tomcat 10
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
++++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java
+@@ -32,13 +32,13 @@
+ import java.util.Map;
+ import java.util.Set;
+ 
+-import javax.servlet.Servlet;
+-import javax.servlet.ServletConfig;
+-import javax.servlet.ServletContext;
+-import javax.servlet.ServletException;
+-import javax.servlet.http.HttpServlet;
+-import javax.servlet.http.HttpServletRequest;
+-import javax.servlet.http.HttpServletResponse;
++import jakarta.servlet.Servlet;
++import jakarta.servlet.ServletConfig;
++import jakarta.servlet.ServletContext;
++import jakarta.servlet.ServletException;
++import jakarta.servlet.http.HttpServlet;
++import jakarta.servlet.http.HttpServletRequest;
++import jakarta.servlet.http.HttpServletResponse;
+ 
+ import org.eclipse.equinox.internal.jsp.jasper.JspClassLoader;
+ import org.osgi.framework.Bundle;


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 01-add-maven-dependencies.patch
 02-disable-openj9-support.patch
 03-jetty-compatibility.patch
+04-tomcat10-compatibility.patch



View it on GitLab: https://salsa.debian.org/java-team/eclipse-equinox/-/commit/d8a65af416ab46b9c78c4bee60e8eef19e303a2f

-- 
View it on GitLab: https://salsa.debian.org/java-team/eclipse-equinox/-/commit/d8a65af416ab46b9c78c4bee60e8eef19e303a2f
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/20230210/31beb4c8/attachment.htm>