Skip to content

Commit 434c5aa

Browse files
committed
Split log4j module into 3 modules
1 parent 7b84ee6 commit 434c5aa

File tree

2 files changed

+31
-11
lines changed

2 files changed

+31
-11
lines changed

mbi/dist/metadata.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,13 +248,15 @@ MOD junit5-vintage
248248
ART org.junit.vintage junit-vintage-engine
249249
DEP org.junit.platform junit-platform-engine
250250
DEP junit junit
251-
MOD log4j
252-
ART org.apache.logging.log4j log4j-1.2-api
253-
ALIAS log4j log4j
254-
DEP org.apache.logging.log4j log4j-api
251+
MOD log4j-api
255252
ART org.apache.logging.log4j log4j-api
253+
MOD log4j-core
256254
ART org.apache.logging.log4j log4j-core
257255
DEP org.apache.logging.log4j log4j-api
256+
MOD log4j-1.2-api
257+
ART org.apache.logging.log4j log4j-1.2-api
258+
ALIAS log4j log4j
259+
DEP org.apache.logging.log4j log4j-api
258260
MOD mail-api
259261
ART jakarta.mail jakarta.mail-api
260262
MOD maven-antrun-plugin

project/log4j.xml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,29 @@
33
<tag>Apache-2.0</tag>
44
</licensing>
55
<module>
6+
<name>log4j-api</name>
7+
<subDir>log4j-api</subDir>
8+
<dependency>osgi-core</dependency>
9+
<build>
10+
<compiler>
11+
<addSourceRoot>src/main/java</addSourceRoot>
12+
</compiler>
13+
</build>
14+
</module>
15+
<module>
16+
<name>log4j-core</name>
17+
<dependency>log4j-api</dependency>
618
<dependency>osgi-core</dependency>
719
<dependency>jansi</dependency>
820
<dependency>commons-compress</dependency>
921
<dependency>disruptor</dependency>
1022
<dependency>jctools</dependency>
11-
<dependency>jaf-api</dependency>
12-
<dependency>mail-api</dependency>
1323
<build>
1424
<compiler>
15-
<addSourceRoot>log4j-1.2-api/src/main/java</addSourceRoot>
16-
<addSourceRoot>log4j-api/src/main/java</addSourceRoot>
1725
<addSourceRoot>log4j-core/src/main/java</addSourceRoot>
18-
<addSourceRoot>log4j-jakarta-smtp/src/main/java</addSourceRoot>
19-
<excludeSourceMatching>/org/apache/log4j/or/jms/.*</excludeSourceMatching>
2026
<excludeSourceMatching>/org/apache/logging/log4j/core/(jackson|layout/jackson|config/yaml|config/json|parser)/.*</excludeSourceMatching>
2127
<excludeSourceMatching>/org/apache/logging/log4j/core/appender/(db|mom|nosql)/.*</excludeSourceMatching>
2228
<excludeSourceMatching>/org/apache/logging/log4j/core/layout/.*(Csv|Jackson|Xml|Yaml|Json|Gelf).*</excludeSourceMatching>
23-
<excludeSourceMatching>/org/apache/log4j/builders/layout/.*Xml.*</excludeSourceMatching>
2429
<excludeSourceMatching>/org/apache/logging/log4j/core/net/MimeMessageBuilder.java</excludeSourceMatching>
2530
<excludeSourceMatching>/org/apache/logging/log4j/core/net/SmtpManager.java</excludeSourceMatching>
2631
<excludeSourceMatching>/org/apache/logging/log4j/core/appender/SmtpAppender.java</excludeSourceMatching>
@@ -29,4 +34,17 @@
2934
</compiler>
3035
</build>
3136
</module>
37+
<module>
38+
<name>log4j-1.2-api</name>
39+
<subDir>log4j-1.2-api</subDir>
40+
<dependency>log4j-api</dependency>
41+
<dependency>log4j-core</dependency>
42+
<build>
43+
<compiler>
44+
<addSourceRoot>src/main/java</addSourceRoot>
45+
<excludeSourceMatching>/org/apache/log4j/or/jms/.*</excludeSourceMatching>
46+
<excludeSourceMatching>/org/apache/log4j/builders/layout/.*Xml.*</excludeSourceMatching>
47+
</compiler>
48+
</build>
49+
</module>
3250
</project>

0 commit comments

Comments
 (0)