From 0c789139c24776455023b2778d5ee20a40d63d5b Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Fri, 7 Oct 2022 13:42:12 +0200
Subject: [PATCH] fix LOGBACK-1693

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
---
 logback-classic/pom.xml                        |  6 +-----
 logback-classic/src/main/java/module-info.java | 15 +++++++++++++--
 logback-core-blackbox/pom.xml                  |  2 ++
 logback-core/src/main/java/module-info.java    | 15 ++++++++++-----
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
index b1c097dfa7..a2698f4739 100755
--- a/logback-classic/pom.xml
+++ b/logback-classic/pom.xml
@@ -270,16 +270,12 @@
           <execution>
             <id>default-test</id>
             <configuration>
-
-              <!--<argLine>XXadd-opens ch.qos.logback.core/ch.qos.logback.core.testUtil=java.naming</argLine>-->
-              <!--<argLine>XXadd-reads ch.qos.logback.classic=ch.qos.logback.classic/ch.qos.logback.core.testUtil XXadd-reads ch.qos.logback.core=ALL-UNNAMED</argLine>-->
+              <!-- x-show-module-resolution -->
               <argLine>
-                --show-module-resolution
                 --add-modules jakarta.mail
                 --add-modules jakarta.servlet
                 --add-opens ch.qos.logback.core/ch.qos.logback.core.testUtil=java.naming
                 --add-opens ch.qos.logback.classic/ch.qos.logback.classic.testUtil=ch.qos.logback.core
-                --add-reads ch.qos.logback.core=org.codehaus.janino.commons.compiler,org.codehaus.janino.janino
               </argLine>
               <parallel>classes</parallel>
               <threadCount>8</threadCount>
diff --git a/logback-classic/src/main/java/module-info.java b/logback-classic/src/main/java/module-info.java
index dcbe13cdba..f16ef06bf0 100644
--- a/logback-classic/src/main/java/module-info.java
+++ b/logback-classic/src/main/java/module-info.java
@@ -1,9 +1,20 @@
-module ch.qos.logback.classic { 
-  requires org.slf4j;
+module ch.qos.logback.classic {
+  // requires static means optional
   requires static java.management;
+
+  // used by the optional ContextJNDISelector component
+  requires static java.naming;
+
+  // used by the optional LevelChangePropagator component
+  requires static java.logging;
+
+  // used by the optional ContextJNDISelector, MDCInsertingServletFilter among other components
   requires static jakarta.servlet;
+
   requires static jakarta.mail;
 
+  requires org.slf4j;
+
   requires ch.qos.logback.core;
   uses ch.qos.logback.classic.spi.Configurator;
   provides org.slf4j.spi.SLF4JServiceProvider with ch.qos.logback.classic.spi.LogbackServiceProvider;
diff --git a/logback-core-blackbox/pom.xml b/logback-core-blackbox/pom.xml
index 05d8939132..0872cf5397 100644
--- a/logback-core-blackbox/pom.xml
+++ b/logback-core-blackbox/pom.xml
@@ -24,6 +24,7 @@
         </dependency>
 
 
+        <!--
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
@@ -34,6 +35,7 @@
             <artifactId>jakarta.mail-api</artifactId>
             <scope>compile</scope>
         </dependency>
+        -->
 
         <dependency>
             <groupId>org.codehaus.janino</groupId>
diff --git a/logback-core/src/main/java/module-info.java b/logback-core/src/main/java/module-info.java
index 912b9bfee4..197f7642f2 100644
--- a/logback-core/src/main/java/module-info.java
+++ b/logback-core/src/main/java/module-info.java
@@ -1,10 +1,15 @@
 module ch.qos.logback.core {
-    requires static transitive java.sql;
-    requires static transitive java.naming;
-    requires static transitive java.xml; 
-    requires static transitive jakarta.mail;
+    requires static transitive java.xml;
+    requires static java.sql;
 
-    // jakarta.servlet 5.0 is not modular so it cannot be declared 'transitive'
+    // required by the optional SMTPAppenderBase component
+    requires static java.naming;
+
+    // transitive _imposes_ the presence of jakarta.mail on downstream users,
+    // let them declare it if they need it
+    requires static jakarta.mail;
+
+    // jakarta.servlet 5.0 is not modular
     requires static jakarta.servlet;
 
     requires static janino;