From ae4ecc21251b6bb80eeb47f917cc29fac148e57c Mon Sep 17 00:00:00 2001
From: Bertrand Renuart <brenuart@gmail.com>
Date: Tue, 30 Aug 2022 16:26:43 +0200
Subject: [PATCH] Bump to Logback 1.3.0

---
 pom.xml                                       | 19 +++++--------------
 .../SequenceJsonProviderTest.java             |  5 -----
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff5bf102..d060febc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <!-- runtime dependencies -->
         <jackson.version>2.13.3</jackson.version>
         <java-uuid-generator.version>4.0.1</java-uuid-generator.version>
-        <logback.version>1.3.0-beta0</logback.version>
+        <logback.version>1.3.0</logback.version>
 
         <!-- shaded runtime dependencies -->
         <disruptor.version>3.4.4</disruptor.version>
@@ -33,7 +33,7 @@
         <!-- test dependencies -->
         <assertj.version>3.23.1</assertj.version>
         <awaitility.version>4.2.0</awaitility.version>
-        <jakarta-servlet-api.version>5.0.0</jakarta-servlet-api.version>
+        <servlet-api.version>4.0.1</servlet-api.version>
         <junit.version>5.9.0</junit.version>
         <mockito.version>4.7.0</mockito.version>
 
@@ -161,9 +161,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>${jakarta-servlet-api.version}</version>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>${servlet-api.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -720,15 +720,6 @@
                 <logback.version>1.2.11</logback.version>
                 <surefire.reportsSubDir>logback-${logback.version}</surefire.reportsSubDir>
             </properties>
-                <dependencies>
-                    <!-- Logback moved from javax.servlet to jakarta since version 1.3 -->
-                    <dependency>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>javax.servlet-api</artifactId>
-                        <version>4.0.1</version>
-                        <scope>test</scope>
-                    </dependency>
-                </dependencies>
         </profile>
         
         <!--
diff --git a/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java b/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java
index 782d6122..b73c68c7 100644
--- a/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java
+++ b/src/test/java/net/logstash/logback/composite/loggingevent/SequenceJsonProviderTest.java
@@ -119,11 +119,6 @@ public void testSequenceGeneratorInContext() throws IOException {
         SequenceNumberGenerator seqGenerator = mock(SequenceNumberGenerator.class);
         context.setSequenceNumberGenerator(seqGenerator);
         provider.setContext(context);
-        
-        // Workaround for LOGBACK-1663 - can be removed once the issue is fixed upstream
-        assertThat(context.getSequenceNumberGenerator()).isNull();
-        when(context.getSequenceNumberGenerator()).thenReturn(seqGenerator);
-        
         provider.start();
         
         // LoggingEvent is a mock -> it won't have its sequence number out of the generator -> mock the returned values