cleanup dependency declarations

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Oct 7, 2022 · 6259aad · 6259aad
1 parent 0c78913
commit 6259aad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/logback-classic-blackbox/src/test/java/module-info.java b/logback-classic-blackbox/src/test/java/module-info.java
@@ -1,4 +1,5 @@
 module logback.classic.blackbox {
+    requires java.xml;
     requires ch.qos.logback.core;
     requires ch.qos.logback.classic;
     requires jakarta.mail;

diff --git a/logback-core-blackbox/pom.xml b/logback-core-blackbox/pom.xml
@@ -24,19 +24,6 @@
         </dependency>
 
 
-        <!--
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        -->
-
         <dependency>
             <groupId>org.codehaus.janino</groupId>
             <artifactId>janino</artifactId>

diff --git a/logback-core-blackbox/src/test/java/module-info.java b/logback-core-blackbox/src/test/java/module-info.java
@@ -1,9 +1,13 @@
 module ch.qos.logback.core.blackbox {
+    requires java.xml;
+
     requires ch.qos.logback.core;
 
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.engine;
+
     requires janino;
+
     exports ch.qos.logback.core.blackbox.joran.conditional;
     exports ch.qos.logback.core.blackbox.joran;
 }
diff --git a/logback-core/src/main/java/module-info.java b/logback-core/src/main/java/module-info.java
@@ -1,23 +1,22 @@
 module ch.qos.logback.core {
-    requires static transitive java.xml;
+    requires transitive java.xml;
     requires static java.sql;
 
     // required by the optional SMTPAppenderBase component
     requires static java.naming;
 
+    requires static janino;
+    requires static commons.compiler;
+
     // 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;
-    requires static commons.compiler;
-
     exports ch.qos.logback.core;
     exports ch.qos.logback.core.boolex;
-
 
     exports ch.qos.logback.core.encoder;
 
@@ -26,11 +25,9 @@
 
     exports ch.qos.logback.core.filter;
 
-
     exports ch.qos.logback.core.joran;
     exports ch.qos.logback.core.joran.action;
     exports ch.qos.logback.core.joran.conditional;
-
     exports ch.qos.logback.core.joran.event;
     exports ch.qos.logback.core.joran.sanity;
     exports ch.qos.logback.core.joran.spi;
@@ -64,7 +61,5 @@
     exports ch.qos.logback.core.testUtil;
     exports ch.qos.logback.core.util;
 
-
-
 }