• Bug#1033364: marked as done (unblock: logback/1:1.2.11-2) (2/2)

    From Debian Bug Tracking System@21:1/5 to All on Fri Mar 24 09:40:02 2023
    [continued from previous message]

    ++++ 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;
    +

    --===============2716827909944338711==--

    Received: (at 1033364-done) by bugs.debian.org; 24 Mar 2023 08:28:44 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.6-bugs.debian.org_2005_01_02
    (2021-04-09) on buxtehude.debian.org
    X-Spam-Level:
    X-Spam-Status: No, score=-107.1 required=4.0 tests=BAYES_00,DKIM_SIGNED,
    DKIM_VALID,DKIM_VALID_AU,ONEWORDBODY,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,
    SPF_NONE,TVD_SPACE_RATIO,USER_IN_DKIM_WELCOMELIST,
    USER_IN_DKIM_WHITELIST autolearn=ham autolearn_force=no
    version=3.4.6-bugs.debian.org_2005_01_02
    X-Spam-Bayes: score:0.0000 Tokens: new, 12; hammy, 93; neutral, 18; spammy, 0.
    spammytokens: hammytokens:0.000-+--H*F:U*sramacher,
    0.000-+--H*Ad:U*sramacher, 0.000-+--H*RU:16a8,
    0.000-+--Hx-spam-relays-external:16a8, 0.000-+--H*rp:U*sramacher Return-path: <sramacher@respighi.debian.org>
    Received: from mailly.debian.org ([2001:41b8:202:deb:6564:a62:52c3:4b72]:51724)
    from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=mailly.debian.org,EMAIL=hostmaster@mailly.debian.org (verified)
    by buxtehude.debian.org with esmtps (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256)
    (Exim 4.94.2)
    (envelope-from <sramacher@respighi.debian.org>)
    id 1pfcmy-004dQl-Pb
    for 1033364-done@bugs.debian.org; Fri, 24 Mar 2023 08:28:44 +0000 Received: from respighi.debian.org ([2a02:16a8:dc41:100::131]:52298)
    from C=NA,ST=NA,L=Ankh Morpork,O=Debian SMTP,OU=Debian SMTP CA,CN=respighi.debian.org,EMAIL=hostmaster@respighi.debian.org (verified)
    by mailly.debian.org with esmtps (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256)
    (Exim 4.94.2)
    (envelope-from <sramacher@respighi.debian.org>)
    id 1pfcmw-00Elxb-4J
    for 1033364-done@bugs.debian.org; Fri, 24 Mar 2023 08:28:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
    d=respighi.debian.org; s=smtpauto.respighi; h=Date:From:Message-Id:
    Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:To:Reply-To:Cc:
    Content-ID:Content-Description:In-Reply-To:References;
    bh=5bRdXg+fubkBz3BaoLY1WsiedlmO1YJGSCj1MJk46IU=; b=O7RqpBmmrz18WElp9SifDmJXSk
    6W5bWXjZaz2pSO+54gauWairHvuJZXkwTZqZwC8u5+yqPtvqVTPVF4vLOZqMrYGUvH/wqngFvrMT0
    tJJzBv64WiAaUr/BsaR4rBpblKX1ZqXdQccRsJzT4Czm/pXDdQF8vyCYLSbWVU4JVs6yVFHOq+mar
    2zPSSz8fgBpGJJEiyplabSGt2d6vD9qaDpdVwetzThABfrHafHJtwbaYUwSzJUKk6ydmp7Al5DO50
    qBxlZ0KMcgTFpwpRNzxwiwxAd/PwTdk31ilkuG414EEFFFNj4lyTm4YO6MaXJnO1U4qzX5pGloMga
    xtjXQEtA==;
    Received: from sramacher by respighi.debian.org with local (Exim 4.94.2)
    (envelope-from <sramacher@respighi.debian.org>)
    id 1pfcmv-007hpq-Jg
    for 1033364-done@bugs.debian.org; Fri, 24 Mar 2023 08:28:41 +0000
    To: 1033364-done@bugs.debian.org
    Subject: unblock logback
    MIME-Version: 1.0
    Content-Type: text/plain; charset="UTF-8"
    Content-Transfer-Encoding: 8bit
    Message-Id: <E1pfcmv-007hpq-Jg@respighi.debian.org>
    From: Sebastian Ramacher <sramacher@respighi.debian.org>
    Date: Fri, 24 Mar 2023 08:28:41 +0000
    X-CrossAssassin-Score: 74

    Unblocked.

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)