Split log4j module into 3 modules

fedora-java · Aug 23, 2024 · 434c5aa · 434c5aa
1 parent 7b84ee6
commit 434c5aa
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 11 deletions.
diff --git a/mbi/dist/metadata.txt b/mbi/dist/metadata.txt
@@ -248,13 +248,15 @@ MOD junit5-vintage
   ART org.junit.vintage junit-vintage-engine
     DEP org.junit.platform junit-platform-engine
     DEP junit junit
-MOD log4j
-  ART org.apache.logging.log4j log4j-1.2-api
-    ALIAS log4j log4j
-    DEP org.apache.logging.log4j log4j-api
+MOD log4j-api
   ART org.apache.logging.log4j log4j-api
+MOD log4j-core
   ART org.apache.logging.log4j log4j-core
     DEP org.apache.logging.log4j log4j-api
+MOD log4j-1.2-api
+  ART org.apache.logging.log4j log4j-1.2-api
+    ALIAS log4j log4j
+    DEP org.apache.logging.log4j log4j-api
 MOD mail-api
   ART jakarta.mail jakarta.mail-api
 MOD maven-antrun-plugin

diff --git a/project/log4j.xml b/project/log4j.xml
@@ -3,24 +3,29 @@
     <tag>Apache-2.0</tag>
   </licensing>
   <module>
+    <name>log4j-api</name>
+    <subDir>log4j-api</subDir>
+    <dependency>osgi-core</dependency>
+    <build>
+      <compiler>
+        <addSourceRoot>src/main/java</addSourceRoot>
+      </compiler>
+    </build>
+  </module>
+  <module>
+    <name>log4j-core</name>
+    <dependency>log4j-api</dependency>
     <dependency>osgi-core</dependency>
     <dependency>jansi</dependency>
     <dependency>commons-compress</dependency>
     <dependency>disruptor</dependency>
     <dependency>jctools</dependency>
-    <dependency>jaf-api</dependency>
-    <dependency>mail-api</dependency>
     <build>
       <compiler>
-        <addSourceRoot>log4j-1.2-api/src/main/java</addSourceRoot>
-        <addSourceRoot>log4j-api/src/main/java</addSourceRoot>
         <addSourceRoot>log4j-core/src/main/java</addSourceRoot>
-        <addSourceRoot>log4j-jakarta-smtp/src/main/java</addSourceRoot>
-        <excludeSourceMatching>/org/apache/log4j/or/jms/.*</excludeSourceMatching>
         <excludeSourceMatching>/org/apache/logging/log4j/core/(jackson|layout/jackson|config/yaml|config/json|parser)/.*</excludeSourceMatching>
         <excludeSourceMatching>/org/apache/logging/log4j/core/appender/(db|mom|nosql)/.*</excludeSourceMatching>
         <excludeSourceMatching>/org/apache/logging/log4j/core/layout/.*(Csv|Jackson|Xml|Yaml|Json|Gelf).*</excludeSourceMatching>
-        <excludeSourceMatching>/org/apache/log4j/builders/layout/.*Xml.*</excludeSourceMatching>
         <excludeSourceMatching>/org/apache/logging/log4j/core/net/MimeMessageBuilder.java</excludeSourceMatching>
         <excludeSourceMatching>/org/apache/logging/log4j/core/net/SmtpManager.java</excludeSourceMatching>
         <excludeSourceMatching>/org/apache/logging/log4j/core/appender/SmtpAppender.java</excludeSourceMatching>
@@ -29,4 +34,17 @@
       </compiler>
     </build>
   </module>
+  <module>
+    <name>log4j-1.2-api</name>
+    <subDir>log4j-1.2-api</subDir>
+    <dependency>log4j-api</dependency>
+    <dependency>log4j-core</dependency>
+    <build>
+      <compiler>
+        <addSourceRoot>src/main/java</addSourceRoot>
+        <excludeSourceMatching>/org/apache/log4j/or/jms/.*</excludeSourceMatching>
+        <excludeSourceMatching>/org/apache/log4j/builders/layout/.*Xml.*</excludeSourceMatching>
+      </compiler>
+    </build>
+  </module>
 </project>