diff --git a/logback-classic-blackbox/src/test/java/module-info.java b/logback-classic-blackbox/src/test/java/module-info.java index 92320936ff..be2dddc6b8 100644 --- 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 index 0872cf5397..5bd3f3ec42 100644 --- a/logback-core-blackbox/pom.xml +++ b/logback-core-blackbox/pom.xml @@ -24,19 +24,6 @@ - - org.codehaus.janino janino diff --git a/logback-core-blackbox/src/test/java/module-info.java b/logback-core-blackbox/src/test/java/module-info.java index f776abd590..bf5c1af19c 100644 --- 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; } \ No newline at end of file diff --git a/logback-core/src/main/java/module-info.java b/logback-core/src/main/java/module-info.java index 197f7642f2..ce45caefa8 100644 --- a/logback-core/src/main/java/module-info.java +++ b/logback-core/src/main/java/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 jakarta.mail on downstream users, // let them declare it if they need it requires static jakarta.mail; @@ -12,12 +15,8 @@ // 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; - - }