Skip to content

Commit 6259aad

Browse files
committed
cleanup dependency declarations
Signed-off-by: Ceki Gulcu <[email protected]>
1 parent 0c78913 commit 6259aad

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

logback-classic-blackbox/src/test/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module logback.classic.blackbox {
2+
requires java.xml;
23
requires ch.qos.logback.core;
34
requires ch.qos.logback.classic;
45
requires jakarta.mail;

logback-core-blackbox/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,6 @@
2424
</dependency>
2525

2626

27-
<!--
28-
<dependency>
29-
<groupId>jakarta.servlet</groupId>
30-
<artifactId>jakarta.servlet-api</artifactId>
31-
</dependency>
32-
33-
<dependency>
34-
<groupId>jakarta.mail</groupId>
35-
<artifactId>jakarta.mail-api</artifactId>
36-
<scope>compile</scope>
37-
</dependency>
38-
-->
39-
4027
<dependency>
4128
<groupId>org.codehaus.janino</groupId>
4229
<artifactId>janino</artifactId>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
module ch.qos.logback.core.blackbox {
2+
requires java.xml;
3+
24
requires ch.qos.logback.core;
35

46
requires org.junit.jupiter.api;
57
requires org.junit.jupiter.engine;
8+
69
requires janino;
10+
711
exports ch.qos.logback.core.blackbox.joran.conditional;
812
exports ch.qos.logback.core.blackbox.joran;
913
}

logback-core/src/main/java/module-info.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
module ch.qos.logback.core {
2-
requires static transitive java.xml;
2+
requires transitive java.xml;
33
requires static java.sql;
44

55
// required by the optional SMTPAppenderBase component
66
requires static java.naming;
77

8+
requires static janino;
9+
requires static commons.compiler;
10+
811
// transitive _imposes_ the presence of jakarta.mail on downstream users,
912
// let them declare it if they need it
1013
requires static jakarta.mail;
1114

1215
// jakarta.servlet 5.0 is not modular
1316
requires static jakarta.servlet;
1417

15-
requires static janino;
16-
requires static commons.compiler;
17-
1818
exports ch.qos.logback.core;
1919
exports ch.qos.logback.core.boolex;
20-
2120

2221
exports ch.qos.logback.core.encoder;
2322

@@ -26,11 +25,9 @@
2625

2726
exports ch.qos.logback.core.filter;
2827

29-
3028
exports ch.qos.logback.core.joran;
3129
exports ch.qos.logback.core.joran.action;
3230
exports ch.qos.logback.core.joran.conditional;
33-
3431
exports ch.qos.logback.core.joran.event;
3532
exports ch.qos.logback.core.joran.sanity;
3633
exports ch.qos.logback.core.joran.spi;
@@ -64,7 +61,5 @@
6461
exports ch.qos.logback.core.testUtil;
6562
exports ch.qos.logback.core.util;
6663

67-
68-
6964
}
7065

0 commit comments

Comments
 (0)