further JIGSAW/JMPS modularization of slf4j

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Dec 19, 2023 · 30295c8 · 30295c8
1 parent 8f86910
commit 30295c8
Show file tree

Hide file tree

Showing 19 changed files with 193 additions and 92 deletions.
diff --git a/jcl-over-slf4j-blackbox/pom.xml b/jcl-over-slf4j-blackbox/pom.xml
@@ -53,4 +53,16 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/jul-to-slf4j-blackbox/pom.xml b/jul-to-slf4j-blackbox/pom.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <parent>
+    <groupId>org.slf4j</groupId>
+    <artifactId>slf4j-parent</artifactId>
+    <version>2.1.0-alpha0-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>jul-to-slf4j-blackbox</artifactId>
+  <packaging>jar</packaging>
+  <name>jul-to-slf4j blackbox testing</name>
+  <description>jul-to-slf4j blackbox testing</description>
+  <url>http://www.slf4j.org</url>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <properties>
+
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-reload4j</artifactId>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/jul-to-slf4j-blackbox/src/main/java/module-info.java b/jul-to-slf4j-blackbox/src/main/java/module-info.java
@@ -0,0 +1,8 @@
+module jul.to.slf4j.blackbox {
+    requires  jul.to.slf4j;
+    requires ch.qos.reload4j;
+    requires junit;
+    requires java.logging;
+    requires org.slf4j;
+}
+
diff --git a/...t/java/org/slf4j/bridge/ListAppender.java → ...g/slf4j/bridge/blackbox/ListAppender.java b/...t/java/org/slf4j/bridge/ListAppender.java → ...g/slf4j/bridge/blackbox/ListAppender.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package org.slf4j.bridge;
+package org.slf4j.bridge.blackbox;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...4j/bridge/SLF4JBridgeHandlerPerfTest.java → .../blackbox/SLF4JBridgeHandlerPerfTest.java b/...4j/bridge/SLF4JBridgeHandlerPerfTest.java → .../blackbox/SLF4JBridgeHandlerPerfTest.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package org.slf4j.bridge;
+package org.slf4j.bridge.blackbox;
 
 import java.util.logging.Handler;
 import java.util.logging.LogManager;
@@ -31,8 +31,10 @@
 import org.apache.log4j.PatternLayout;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
 
 public class SLF4JBridgeHandlerPerfTest {
 

diff --git a/.../slf4j/bridge/SLF4JBridgeHandlerTest.java → ...idge/blackbox/SLF4JBridgeHandlerTest.java b/.../slf4j/bridge/SLF4JBridgeHandlerTest.java → ...idge/blackbox/SLF4JBridgeHandlerTest.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package org.slf4j.bridge;
+package org.slf4j.bridge.blackbox;
 
 import static org.junit.Assert.assertEquals;
 
@@ -35,6 +35,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.bridge.SLF4JBridgeHandler;
 
 public class SLF4JBridgeHandlerTest {
 

diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml
@@ -24,12 +24,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-reload4j</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
+
   </dependencies>
 
   <build>

diff --git a/log4j-over-slf4j-blackbox/pom.xml b/log4j-over-slf4j-blackbox/pom.xml
@@ -53,4 +53,16 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/log4j-over-slf4j-blackbox/src/main/java/module-info.java b/log4j-over-slf4j-blackbox/src/main/java/module-info.java
@@ -0,0 +1,6 @@
+module log4j.over.slf4j.blackbox {
+
+    requires log4j.over.slf4j;
+    requires java.logging;
+    requires junit;
+}
diff --git a/log4j-over-slf4j/src/main/java/module-info.java b/log4j-over-slf4j/src/main/java/module-info.java
@@ -1,4 +1,4 @@
-module log4j {
+module log4j.over.slf4j {
 	requires org.slf4j;
 	requires java.xml;
 	exports org.apache.log4j;

diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml
@@ -53,11 +53,22 @@
             <Bundle-SymbolicName>org.slf4j.osgi-over-slf4j</Bundle-SymbolicName>
             <Bundle-Activator>org.slf4j.osgi.logservice.impl.Activator</Bundle-Activator>
             <Bundle-Category>osgi</Bundle-Category>
-            <_exportcontents combine.self="override" />
+            <_exportcontents combine.self="override"/>
           </instructions>
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Automatic-Module-Name>org.slf4j.osgi.logservice</Automatic-Module-Name>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
     </plugins>
   </build>