[Git][java-team/logback][master] 3 commits: Revert "Depend on libtomcat10-java instead of libtomcat9-java."
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sat May 27 16:38:59 BST 2023
Markus Koschany pushed to branch master at Debian Java Maintainers / logback
Commits:
c9bbaa27 by Markus Koschany at 2023-05-27T17:17:26+02:00
Revert "Depend on libtomcat10-java instead of libtomcat9-java."
This reverts commit 9952392df31ce3d2f21f996cb241590c58123ae2.
- - - - -
ca3a0500 by Markus Koschany at 2023-05-27T17:17:44+02:00
Revert "Add tomcat10-migration.patch"
This reverts commit 8aee691963599f5ac13c8cbad5165a23cf53aaed.
- - - - -
071a2933 by Markus Koschany at 2023-05-27T17:22:09+02:00
Update changelog
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/maven.rules
- debian/patches/series
- − debian/patches/tomcat10-migration.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+logback (1:1.2.11-3) unstable; urgency=medium
+
+ * Team upload.
+ * Revert switch to libtomcat10-java. (Closes: #1034855)
+
+ -- Markus Koschany <apo at debian.org> Sat, 27 May 2023 17:17:59 +0200
+
logback (1:1.2.11-2) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -17,7 +17,7 @@ Build-Depends:
libmaven-javadoc-plugin-java,
libservlet-api-java,
libslf4j-java (>= 1.7.18),
- libtomcat10-java,
+ libtomcat9-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/.*/10.x/
-org.apache.tomcat tomcat-coyote * s/.*/10.x/
+org.apache.tomcat tomcat-catalina * s/.*/9.x/
+org.apache.tomcat tomcat-coyote * s/.*/9.x/
org.eclipse.jetty jetty-server * s/.*/9.x/
=====================================
debian/patches/series
=====================================
@@ -2,4 +2,3 @@
04-privacy-breach.patch
05-java11-compatibility.patch
06-jetty-compatibility.patch
-tomcat10-migration.patch
=====================================
debian/patches/tomcat10-migration.patch deleted
=====================================
@@ -1,593 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sat, 4 Mar 2023 19:43:08 +0100
-Subject: tomcat10 migration
-
-Forwarded: not-needed
----
- logback-access/pom.xml | 3 +--
- .../ch/qos/logback/access/ViewStatusMessagesServlet.java | 6 +++---
- .../java/ch/qos/logback/access/jetty/RequestLogImpl.java | 3 ++-
- .../java/ch/qos/logback/access/servlet/TeeFilter.java | 16 ++++++++--------
- .../logback/access/servlet/TeeHttpServletRequest.java | 6 +++---
- .../logback/access/servlet/TeeHttpServletResponse.java | 6 +++---
- .../logback/access/servlet/TeeServletInputStream.java | 6 +++---
- .../logback/access/servlet/TeeServletOutputStream.java | 6 +++---
- .../main/java/ch/qos/logback/access/servlet/Util.java | 4 ++--
- .../logback/access/sift/AccessEventDiscriminator.java | 4 ++--
- .../main/java/ch/qos/logback/access/spi/AccessEvent.java | 8 ++++----
- .../java/ch/qos/logback/access/spi/IAccessEvent.java | 4 ++--
- .../java/ch/qos/logback/access/tomcat/LogbackValve.java | 4 ++--
- .../java/ch/qos/logback/access/dummy/DummyRequest.java | 4 ++--
- .../java/ch/qos/logback/access/dummy/DummyResponse.java | 6 +++---
- .../logback/access/dummy/DummyServletOutputStream.java | 4 ++--
- .../ch/qos/logback/access/jetty/JettyFixtureBase.java | 6 +++---
- .../ch/qos/logback/access/pattern/ConverterTest.java | 2 +-
- logback-classic/pom.xml | 13 +++++++++++++
- .../qos/logback/classic/ViewStatusMessagesServlet.java | 4 ++--
- .../classic/helpers/MDCInsertingServletFilter.java | 14 +++++++-------
- .../classic/selector/servlet/ContextDetachingSCL.java | 4 ++--
- .../classic/selector/servlet/LoggerContextFilter.java | 12 ++++++------
- .../servlet/LogbackServletContainerInitializer.java | 6 +++---
- .../classic/servlet/LogbackServletContextListener.java | 4 ++--
- .../services/jakarta.servlet.ServletContainerInitializer | 1 +
- .../services/javax.servlet.ServletContainerInitializer | 1 -
- .../servlet/LogbackServletContainerInitializerTest.java | 4 ++--
- logback-core/pom.xml | 16 ++++++++++++++--
- .../core/status/ViewStatusMessagesServletBase.java | 8 ++++----
- logback-examples/pom.xml | 2 +-
- .../src/main/java/chapters/mdc/UserServletFilter.java | 14 +++++++-------
- 32 files changed, 113 insertions(+), 88 deletions(-)
- create mode 100755 logback-classic/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
- delete mode 100755 logback-classic/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
-
-diff --git a/logback-access/pom.xml b/logback-access/pom.xml
-index b1704f1..c4bdf50 100755
---- a/logback-access/pom.xml
-+++ b/logback-access/pom.xml
-@@ -120,8 +120,7 @@
- <Import-Package>
- ch.qos.logback.core.rolling,
- ch.qos.logback.core.rolling.helper,
-- javax.servlet.*;version="2.5",
-- javax.*;resolution:=optional,
-+ javax.servlet.*;version="5.0.0",
- org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,
- org.eclipse.jetty.*;version="${jetty.version}";resolution:=optional,
- *
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java b/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java
-index ce4d448..1658380 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/ViewStatusMessagesServlet.java
-@@ -13,9 +13,9 @@
- */
- package ch.qos.logback.access;
-
--import javax.servlet.ServletContext;
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.ServletContext;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
-
- import ch.qos.logback.core.status.StatusManager;
- import ch.qos.logback.core.status.ViewStatusMessagesServletBase;
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
-index f74fc57..e4781f3 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/jetty/RequestLogImpl.java
-@@ -15,6 +15,7 @@ package ch.qos.logback.access.jetty;
-
- import java.io.File;
- import java.net.URL;
-+import java.util.EventListener;
- import java.util.HashMap;
- import java.util.Iterator;
- import java.util.List;
-@@ -130,7 +131,7 @@ public class RequestLogImpl extends ContextBase implements RequestLog, AppenderA
- @Override
- public void log(Request jettyRequest, Response jettyResponse) {
- JettyServerAdapter adapter = new JettyServerAdapter(jettyRequest, jettyResponse);
-- IAccessEvent accessEvent = new AccessEvent(jettyRequest, jettyResponse, adapter);
-+ IAccessEvent accessEvent = null;
- if (getFilterChainDecision(accessEvent) == FilterReply.DENY) {
- return;
- }
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java
-index eed0968..6900020 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeFilter.java
-@@ -19,14 +19,14 @@ import java.net.UnknownHostException;
- import java.util.ArrayList;
- import java.util.List;
-
--import javax.servlet.Filter;
--import javax.servlet.FilterChain;
--import javax.servlet.FilterConfig;
--import javax.servlet.ServletException;
--import javax.servlet.ServletRequest;
--import javax.servlet.ServletResponse;
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.Filter;
-+import jakarta.servlet.FilterChain;
-+import jakarta.servlet.FilterConfig;
-+import jakarta.servlet.ServletException;
-+import jakarta.servlet.ServletRequest;
-+import jakarta.servlet.ServletResponse;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
-
- import static ch.qos.logback.access.AccessConstants.LB_OUTPUT_BUFFER;
- import static ch.qos.logback.access.AccessConstants.TEE_FILTER_INCLUDES_PARAM;
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java
-index 8ab9c6d..0abb005 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletRequest.java
-@@ -17,9 +17,9 @@ import java.io.BufferedReader;
- import java.io.IOException;
- import java.io.InputStreamReader;
-
--import javax.servlet.ServletInputStream;
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletRequestWrapper;
-+import jakarta.servlet.ServletInputStream;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletRequestWrapper;
-
- import static ch.qos.logback.access.AccessConstants.LB_INPUT_BUFFER;
-
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java
-index 6dfd6dd..e2a8243 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeHttpServletResponse.java
-@@ -17,9 +17,9 @@ import java.io.IOException;
- import java.io.OutputStreamWriter;
- import java.io.PrintWriter;
-
--import javax.servlet.ServletOutputStream;
--import javax.servlet.http.HttpServletResponse;
--import javax.servlet.http.HttpServletResponseWrapper;
-+import jakarta.servlet.ServletOutputStream;
-+import jakarta.servlet.http.HttpServletResponse;
-+import jakarta.servlet.http.HttpServletResponseWrapper;
-
- public class TeeHttpServletResponse extends HttpServletResponseWrapper {
-
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
-index 207a84f..7c34954 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
-@@ -18,9 +18,9 @@ import java.io.ByteArrayOutputStream;
- import java.io.IOException;
- import java.io.InputStream;
-
--import javax.servlet.ReadListener;
--import javax.servlet.ServletInputStream;
--import javax.servlet.http.HttpServletRequest;
-+import jakarta.servlet.ReadListener;
-+import jakarta.servlet.ServletInputStream;
-+import jakarta.servlet.http.HttpServletRequest;
-
- class TeeServletInputStream extends ServletInputStream {
-
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
-index 687eb62..fe4a3a9 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
-@@ -16,9 +16,9 @@ package ch.qos.logback.access.servlet;
- import java.io.ByteArrayOutputStream;
- import java.io.IOException;
-
--import javax.servlet.ServletOutputStream;
--import javax.servlet.ServletResponse;
--import javax.servlet.WriteListener;
-+import jakarta.servlet.ServletOutputStream;
-+import jakarta.servlet.ServletResponse;
-+import jakarta.servlet.WriteListener;
-
- public class TeeServletOutputStream extends ServletOutputStream {
-
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java b/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java
-index 241d439..2554470 100755
---- a/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/Util.java
-@@ -15,8 +15,8 @@ package ch.qos.logback.access.servlet;
-
- import ch.qos.logback.access.AccessConstants;
-
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
-
- public class Util {
-
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/sift/AccessEventDiscriminator.java b/logback-access/src/main/java/ch/qos/logback/access/sift/AccessEventDiscriminator.java
-index 820d85d..21ebd96 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/sift/AccessEventDiscriminator.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/sift/AccessEventDiscriminator.java
-@@ -13,8 +13,8 @@
- */
- package ch.qos.logback.access.sift;
-
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpSession;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpSession;
-
- import ch.qos.logback.access.spi.IAccessEvent;
- import ch.qos.logback.core.sift.AbstractDiscriminator;
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java b/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java
-index ffe7338..5835ca6 100755
---- a/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/spi/AccessEvent.java
-@@ -17,10 +17,10 @@ import ch.qos.logback.access.AccessConstants;
- import ch.qos.logback.access.pattern.AccessConverter;
- import ch.qos.logback.access.servlet.Util;
-
--import javax.servlet.http.Cookie;
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
--import javax.servlet.http.HttpSession;
-+import jakarta.servlet.http.Cookie;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
-+import jakarta.servlet.http.HttpSession;
-
- import java.io.Serializable;
- import java.util.ArrayList;
-diff --git a/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java b/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java
-index d7439f3..5bf82a2 100644
---- a/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java
-+++ b/logback-access/src/main/java/ch/qos/logback/access/spi/IAccessEvent.java
-@@ -15,8 +15,8 @@ package ch.qos.logback.access.spi;
-
- import ch.qos.logback.core.spi.DeferredProcessingAware;
-
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
- import java.util.Enumeration;
- import java.util.List;
- import java.util.Map;
-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;
-diff --git a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java
-index 0110fd9..90a9748 100644
---- a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java
-+++ b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyRequest.java
-@@ -15,8 +15,8 @@ package ch.qos.logback.access.dummy;
-
- import ch.qos.logback.access.AccessConstants;
-
--import javax.servlet.*;
--import javax.servlet.http.*;
-+import jakarta.servlet.*;
-+import jakarta.servlet.http.*;
- import java.io.BufferedReader;
- import java.io.IOException;
- import java.io.UnsupportedEncodingException;
-diff --git a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java
-index e8950c1..4d5a055 100644
---- a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java
-+++ b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyResponse.java
-@@ -17,9 +17,9 @@ import java.io.IOException;
- import java.io.PrintWriter;
- import java.util.*;
-
--import javax.servlet.ServletOutputStream;
--import javax.servlet.http.Cookie;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.ServletOutputStream;
-+import jakarta.servlet.http.Cookie;
-+import jakarta.servlet.http.HttpServletResponse;
-
- public class DummyResponse implements HttpServletResponse {
-
-diff --git a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServletOutputStream.java b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServletOutputStream.java
-index 6937a4f..bf84cff 100644
---- a/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServletOutputStream.java
-+++ b/logback-access/src/test/java/ch/qos/logback/access/dummy/DummyServletOutputStream.java
-@@ -13,8 +13,8 @@
- */
- package ch.qos.logback.access.dummy;
-
--import javax.servlet.ServletOutputStream;
--import javax.servlet.WriteListener;
-+import jakarta.servlet.ServletOutputStream;
-+import jakarta.servlet.WriteListener;
-
- import java.io.IOException;
- import java.io.OutputStream;
-diff --git a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java
-index e461c58..6cd2f44 100644
---- a/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java
-+++ b/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyFixtureBase.java
-@@ -23,9 +23,9 @@ import org.eclipse.jetty.server.handler.RequestLogHandler;
- import org.eclipse.jetty.server.nio.SelectChannelConnector;
- import org.eclipse.jetty.util.ByteArrayISO8859Writer;
-
--import javax.servlet.ServletException;
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.ServletException;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
- import java.io.IOException;
- import java.io.OutputStream;
-
-diff --git a/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java b/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java
-index b126cde..434b984 100644
---- a/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java
-+++ b/logback-access/src/test/java/ch/qos/logback/access/pattern/ConverterTest.java
-@@ -18,7 +18,7 @@ import static org.junit.Assert.assertEquals;
- import java.util.ArrayList;
- import java.util.List;
-
--import javax.servlet.http.Cookie;
-+import jakarta.servlet.http.Cookie;
-
- import ch.qos.logback.access.spi.IAccessEvent;
- import org.junit.After;
-diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
-index 2643973..b2a71e0 100755
---- a/logback-classic/pom.xml
-+++ b/logback-classic/pom.xml
-@@ -107,6 +107,19 @@
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-+ <dependency>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>tomcat-catalina</artifactId>
-+ <scope>compile</scope>
-+ <optional>true</optional>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>tomcat-coyote</artifactId>
-+ <scope>compile</scope>
-+ <optional>true</optional>
-+ </dependency>
-+
- <dependency>
- <groupId>com.icegreen</groupId>
- <artifactId>greenmail</artifactId>
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/ViewStatusMessagesServlet.java b/logback-classic/src/main/java/ch/qos/logback/classic/ViewStatusMessagesServlet.java
-index 113aaca..9c00493 100644
---- a/logback-classic/src/main/java/ch/qos/logback/classic/ViewStatusMessagesServlet.java
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/ViewStatusMessagesServlet.java
-@@ -13,8 +13,8 @@
- */
- package ch.qos.logback.classic;
-
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
-
- import org.slf4j.LoggerFactory;
-
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java b/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
-index 4b1e7aa..b98c11f 100644
---- a/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java
-@@ -15,13 +15,13 @@ package ch.qos.logback.classic.helpers;
-
- import java.io.IOException;
-
--import javax.servlet.Filter;
--import javax.servlet.FilterChain;
--import javax.servlet.FilterConfig;
--import javax.servlet.ServletException;
--import javax.servlet.ServletRequest;
--import javax.servlet.ServletResponse;
--import javax.servlet.http.HttpServletRequest;
-+import jakarta.servlet.Filter;
-+import jakarta.servlet.FilterChain;
-+import jakarta.servlet.FilterConfig;
-+import jakarta.servlet.ServletException;
-+import jakarta.servlet.ServletRequest;
-+import jakarta.servlet.ServletResponse;
-+import jakarta.servlet.http.HttpServletRequest;
-
- import org.slf4j.MDC;
-
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java b/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java
-index fec091b..68c96a6 100644
---- a/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/ContextDetachingSCL.java
-@@ -17,8 +17,8 @@ import static ch.qos.logback.classic.ClassicConstants.JNDI_CONTEXT_NAME;
-
- import javax.naming.Context;
- import javax.naming.NamingException;
--import javax.servlet.ServletContextEvent;
--import javax.servlet.ServletContextListener;
-+import jakarta.servlet.ServletContextEvent;
-+import jakarta.servlet.ServletContextListener;
-
- import org.slf4j.Logger;
-
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java b/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java
-index 28f7d38..e1b660c 100644
---- a/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/selector/servlet/LoggerContextFilter.java
-@@ -15,12 +15,12 @@ package ch.qos.logback.classic.selector.servlet;
-
- import java.io.IOException;
-
--import javax.servlet.Filter;
--import javax.servlet.FilterChain;
--import javax.servlet.FilterConfig;
--import javax.servlet.ServletException;
--import javax.servlet.ServletRequest;
--import javax.servlet.ServletResponse;
-+import jakarta.servlet.Filter;
-+import jakarta.servlet.FilterChain;
-+import jakarta.servlet.FilterConfig;
-+import jakarta.servlet.ServletException;
-+import jakarta.servlet.ServletRequest;
-+import jakarta.servlet.ServletResponse;
-
- import org.slf4j.LoggerFactory;
-
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializer.java b/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializer.java
-index bb0fa07..7e4b4b0 100755
---- a/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializer.java
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializer.java
-@@ -4,9 +4,9 @@ import static ch.qos.logback.core.CoreConstants.DISABLE_SERVLET_CONTAINER_INITIA
-
- import java.util.Set;
-
--import javax.servlet.ServletContainerInitializer;
--import javax.servlet.ServletContext;
--import javax.servlet.ServletException;
-+import jakarta.servlet.ServletContainerInitializer;
-+import jakarta.servlet.ServletContext;
-+import jakarta.servlet.ServletException;
-
- import ch.qos.logback.classic.util.StatusViaSLF4JLoggerFactory;
- import ch.qos.logback.core.util.OptionHelper;
-diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContextListener.java b/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContextListener.java
-index f4bc045..1ada444 100755
---- a/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContextListener.java
-+++ b/logback-classic/src/main/java/ch/qos/logback/classic/servlet/LogbackServletContextListener.java
-@@ -1,7 +1,7 @@
- package ch.qos.logback.classic.servlet;
-
--import javax.servlet.ServletContextEvent;
--import javax.servlet.ServletContextListener;
-+import jakarta.servlet.ServletContextEvent;
-+import jakarta.servlet.ServletContextListener;
-
- import org.slf4j.ILoggerFactory;
- import org.slf4j.LoggerFactory;
-diff --git a/logback-classic/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer b/logback-classic/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
-new file mode 100755
-index 0000000..23269e7
---- /dev/null
-+++ b/logback-classic/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
-@@ -0,0 +1 @@
-+ch.qos.logback.classic.servlet.LogbackServletContainerInitializer
-\ No newline at end of file
-diff --git a/logback-classic/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/logback-classic/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
-deleted file mode 100755
-index 23269e7..0000000
---- a/logback-classic/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
-+++ /dev/null
-@@ -1 +0,0 @@
--ch.qos.logback.classic.servlet.LogbackServletContainerInitializer
-\ No newline at end of file
-diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializerTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializerTest.java
-index b31981e..28e07b0 100755
---- a/logback-classic/src/test/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializerTest.java
-+++ b/logback-classic/src/test/java/ch/qos/logback/classic/servlet/LogbackServletContainerInitializerTest.java
-@@ -10,8 +10,8 @@ import ch.qos.logback.core.CoreConstants;
-
- import static org.mockito.Mockito.*;
-
--import javax.servlet.ServletContext;
--import javax.servlet.ServletException;
-+import jakarta.servlet.ServletContext;
-+import jakarta.servlet.ServletException;
-
- public class LogbackServletContainerInitializerTest {
-
-diff --git a/logback-core/pom.xml b/logback-core/pom.xml
-index 94a417e..d3ea033 100755
---- a/logback-core/pom.xml
-+++ b/logback-core/pom.xml
-@@ -40,8 +40,20 @@
- <scope>test</scope>
- </dependency>
- <dependency>
-- <groupId>javax.servlet</groupId>
-- <artifactId>javax.servlet-api</artifactId>
-+ <groupId>javax.servlet</groupId>
-+ <artifactId>javax.servlet-api</artifactId>
-+ <scope>compile</scope>
-+ <optional>true</optional>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>tomcat-catalina</artifactId>
-+ <scope>compile</scope>
-+ <optional>true</optional>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.apache.tomcat</groupId>
-+ <artifactId>tomcat-coyote</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-diff --git a/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java b/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java
-index e1c483b..5ce08af 100644
---- a/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java
-+++ b/logback-core/src/main/java/ch/qos/logback/core/status/ViewStatusMessagesServletBase.java
-@@ -20,10 +20,10 @@ import java.io.PrintWriter;
- import java.io.StringWriter;
- import java.util.List;
-
--import javax.servlet.ServletException;
--import javax.servlet.http.HttpServlet;
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
-+import jakarta.servlet.ServletException;
-+import jakarta.servlet.http.HttpServlet;
-+import jakarta.servlet.http.HttpServletRequest;
-+import jakarta.servlet.http.HttpServletResponse;
-
- import ch.qos.logback.core.CoreConstants;
- import ch.qos.logback.core.helpers.Transform;
-diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml
-index 52c34c6..c8610ee 100755
---- a/logback-examples/pom.xml
-+++ b/logback-examples/pom.xml
-@@ -44,7 +44,7 @@
- <artifactId>javax.servlet-api</artifactId>
- <scope>compile</scope>
- <optional>true</optional>
-- </dependency>
-+ </dependency>
- <dependency>
- <groupId>org.fusesource.jansi</groupId>
- <artifactId>jansi</artifactId>
-diff --git a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java
-index 8d96661..d779671 100644
---- a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java
-+++ b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java
-@@ -16,13 +16,13 @@ package chapters.mdc;
- import java.io.IOException;
- import java.security.Principal;
-
--import javax.servlet.Filter;
--import javax.servlet.FilterChain;
--import javax.servlet.FilterConfig;
--import javax.servlet.ServletException;
--import javax.servlet.ServletRequest;
--import javax.servlet.ServletResponse;
--import javax.servlet.http.HttpServletRequest;
-+import jakarta.servlet.Filter;
-+import jakarta.servlet.FilterChain;
-+import jakarta.servlet.FilterConfig;
-+import jakarta.servlet.ServletException;
-+import jakarta.servlet.ServletRequest;
-+import jakarta.servlet.ServletResponse;
-+import jakarta.servlet.http.HttpServletRequest;
-
- import org.slf4j.MDC;
-
View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/539e092f2eb71242c6bb8c7ae14b1dab5ca2bc57...071a29336eb9ada4d09c3fc7a31a496df8537089
--
View it on GitLab: https://salsa.debian.org/java-team/logback/-/compare/539e092f2eb71242c6bb8c7ae14b1dab5ca2bc57...071a29336eb9ada4d09c3fc7a31a496df8537089
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/20230527/0b71204d/attachment.htm>
More information about the pkg-java-commits
mailing list