[Git][java-team/logback][master] 3 commits: Depend on libtomcat10-java instead of libtomcat9-java.

[Markus Koschany (@apo)]

Markus Koschany pushed to branch master at Debian Java Maintainers / logback


Commits:
9952392d by Markus Koschany at 2023-02-19T15:07:47+01:00
Depend on libtomcat10-java instead of libtomcat9-java.

- - - - -
8aee6919 by Markus Koschany at 2023-02-19T16:12:26+01:00
Add tomcat10-migration.patch

- - - - -
334a7d13 by Markus Koschany at 2023-02-19T16:12:53+01:00
Start new changelog entry

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/maven.rules
- debian/patches/series
- + debian/patches/tomcat10-migration.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+logback (1:1.2.11-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Depend on libtomcat10-java instead of libtomcat9-java.
+  * Add tomcat10-migration.patch.
+
+ -- Markus Koschany <apo at debian.org>  Sun, 19 Feb 2023 16:12:41 +0100
+
 logback (1:1.2.11-1) unstable; urgency=medium
 
   * New upstream version 1.2.11


=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
  libmaven-javadoc-plugin-java,
  libservlet-api-java,
  libslf4j-java (>= 1.7.18),
- libtomcat9-java,
+ libtomcat10-java,
  maven-debian-helper
 Standards-Version: 4.6.0
 Vcs-Git: https://salsa.debian.org/java-team/logback.git


=====================================
debian/maven.rules
=====================================
@@ -1,5 +1,5 @@
 junit junit jar s/4\..*/4.x/
 javax.mail s/mail/javax.mail-api * s/.*/debian/ * *
-org.apache.tomcat tomcat-catalina * s/.*/9.x/
-org.apache.tomcat tomcat-coyote * s/.*/9.x/
+org.apache.tomcat tomcat-catalina * s/.*/10.x/
+org.apache.tomcat tomcat-coyote * s/.*/10.x/
 org.eclipse.jetty jetty-server * s/.*/9.x/


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 04-privacy-breach.patch
 05-java11-compatibility.patch
 06-jetty-compatibility.patch
+tomcat10-migration.patch


=====================================
debian/patches/tomcat10-migration.patch
=====================================
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 19 Feb 2023 15:34:18 +0100
+Subject: tomcat10 migration
+
+---
+ .../src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java      | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java b/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
+index 437de0b..fa49125 100644
+--- a/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
++++ b/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
+@@ -25,8 +25,8 @@ import java.util.concurrent.ExecutorService;
+ import java.util.concurrent.ScheduledExecutorService;
+ import java.util.concurrent.ScheduledFuture;
+ 
+-import javax.servlet.ServletContext;
+-import javax.servlet.ServletException;
++import jakarta.servlet.ServletContext;
++import jakarta.servlet.ServletException;
+ 
+ import org.apache.catalina.Lifecycle;
+ import org.apache.catalina.LifecycleException;



View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/b004347905a788eaaabb4dc9c506b3e8feffd553...334a7d1345d94d2e31672e27a5b9bef354279a4e

-- 
View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/b004347905a788eaaabb4dc9c506b3e8feffd553...334a7d1345d94d2e31672e27a5b9bef354279a4e
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/20230219/44a9abd5/attachment.htm>