cleanup dependency declarations

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

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/logback-classic-blackbox/src/test/java/module-info.java b/logback-classic-blackbox/src/test/java/module-info.java
@@ -1,6 +1,9 @@
 module logback.classic.blackbox {
+    requires java.xml;
+
     requires ch.qos.logback.core;
     requires ch.qos.logback.classic;
+
     requires janino;
 
     requires org.junit.jupiter.api;

diff --git a/logback-classic/src/main/java9/module-info.java b/logback-classic/src/main/java9/module-info.java
@@ -11,6 +11,8 @@
   //  javax.servlet:javax.servlet-api:jar:4.0.1:compile -> auto-named as javax.servlet.api
   requires static javax.servlet.api;
 
+
+
   requires org.slf4j;
   requires ch.qos.logback.core;
   uses ch.qos.logback.classic.spi.Configurator;

diff --git a/logback-core-blackbox/pom.xml b/logback-core-blackbox/pom.xml
@@ -23,15 +23,6 @@
             <artifactId>logback-core</artifactId>
         </dependency>
 
-
-        <!--
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>javax.mail-api</artifactId>
-            <scope>test</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,8 +1,11 @@
 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;

diff --git a/logback-core/src/main/java9/module-info.java b/logback-core/src/main/java9/module-info.java
@@ -1,10 +1,13 @@
 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 javax.mail on downstream users,
     // let them declare it if they need it
     requires static javax.mail.api;
@@ -13,8 +16,6 @@
     requires static javax.servlet.api;
 
 
-    requires static janino;
-    requires static commons.compiler;
 
     exports ch.qos.logback.core;
     exports ch.qos.logback.core.boolex;
@@ -26,7 +27,6 @@
 
     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;
@@ -43,7 +43,6 @@
     exports ch.qos.logback.core.model.processor.conditional;
     exports ch.qos.logback.core.model.util;
 
-
     exports ch.qos.logback.core.net;
     exports ch.qos.logback.core.net.server;
     exports ch.qos.logback.core.net.ssl;