From 30295c847a6f7487473413d50b82cb2983a3453e Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Tue, 19 Dec 2023 20:38:20 +0100
Subject: [PATCH] further JIGSAW/JMPS modularization of slf4j

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
---
 jcl-over-slf4j-blackbox/pom.xml               |  12 ++
 jul-to-slf4j-blackbox/pom.xml                 |  69 ++++++++++
 .../src/main/java/module-info.java            |   8 ++
 .../slf4j/bridge/blackbox}/ListAppender.java  |   2 +-
 .../blackbox}/SLF4JBridgeHandlerPerfTest.java |   4 +-
 .../blackbox}/SLF4JBridgeHandlerTest.java     |   3 +-
 jul-to-slf4j/pom.xml                          |   7 +-
 log4j-over-slf4j-blackbox/pom.xml             |  12 ++
 .../src/main/java/module-info.java            |   6 +
 .../src/main/java/module-info.java            |   2 +-
 osgi-over-slf4j/pom.xml                       |  13 +-
 parent/pom.xml                                | 128 +++++++-----------
 pom.xml                                       |   1 +
 release.sh                                    |   2 +-
 slf4j-ext/pom.xml                             |   1 +
 slf4j-migrator/src/main/java/module-info.java |   3 +
 slf4j-reload4j/src/main/java/module-info.java |   5 +
 slf4j-testing/src/main/java/module-info.java  |   5 +
 ...indingMultithreadedInitializationTest.java |   2 +-
 19 files changed, 193 insertions(+), 92 deletions(-)
 create mode 100644 jul-to-slf4j-blackbox/pom.xml
 create mode 100644 jul-to-slf4j-blackbox/src/main/java/module-info.java
 rename {jul-to-slf4j/src/test/java/org/slf4j/bridge => jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox}/ListAppender.java (98%)
 rename {jul-to-slf4j/src/test/java/org/slf4j/bridge => jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox}/SLF4JBridgeHandlerPerfTest.java (97%)
 rename {jul-to-slf4j/src/test/java/org/slf4j/bridge => jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox}/SLF4JBridgeHandlerTest.java (99%)
 mode change 100755 => 100644
 create mode 100644 log4j-over-slf4j-blackbox/src/main/java/module-info.java
 create mode 100644 slf4j-migrator/src/main/java/module-info.java
 create mode 100644 slf4j-reload4j/src/main/java/module-info.java
 create mode 100644 slf4j-testing/src/main/java/module-info.java
 rename slf4j-testing/src/{test/java/org/slf4j/testing/basic => main/java/org/slf4j/testing}/NoBindingMultithreadedInitializationTest.java (98%)

diff --git a/jcl-over-slf4j-blackbox/pom.xml b/jcl-over-slf4j-blackbox/pom.xml
index cc9ffad2b..35e02d1ac 100644
--- 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
new file mode 100644
index 000000000..82ee56ded
--- /dev/null
+++ 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
new file mode 100644
index 000000000..87f397056
--- /dev/null
+++ 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/jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java b/jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox/ListAppender.java
similarity index 98%
rename from jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java
rename to jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox/ListAppender.java
index 41cc5d81a..564cbc4c6 100644
--- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/ListAppender.java
+++ b/jul-to-slf4j-blackbox/src/main/java/org/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/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java b/jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox/SLF4JBridgeHandlerPerfTest.java
similarity index 97%
rename from jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java
rename to jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox/SLF4JBridgeHandlerPerfTest.java
index 2860aa70a..08183ab0a 100644
--- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerPerfTest.java
+++ b/jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/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/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java b/jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox/SLF4JBridgeHandlerTest.java
old mode 100755
new mode 100644
similarity index 99%
rename from jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java
rename to jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/blackbox/SLF4JBridgeHandlerTest.java
index 79ca53e0e..a74946f98
--- a/jul-to-slf4j/src/test/java/org/slf4j/bridge/SLF4JBridgeHandlerTest.java
+++ b/jul-to-slf4j-blackbox/src/main/java/org/slf4j/bridge/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
index 9181e7fca..7f9f412a0 100755
--- 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
index 3a2615f06..af2c3f13f 100644
--- 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
new file mode 100644
index 000000000..1d3c5128a
--- /dev/null
+++ 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;
+}
\ No newline at end of file
diff --git a/log4j-over-slf4j/src/main/java/module-info.java b/log4j-over-slf4j/src/main/java/module-info.java
index 35017beaf..1c93065fe 100755
--- 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
index e107202d4..74bfe0b39 100755
--- 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>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index fdfc71004..0f78f1426 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -24,7 +24,6 @@
   <inceptionYear>2005</inceptionYear>
 
 
-
   <properties>
     <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
     <project.build.outputTimestamp>2023-12-18T13:21:30Z</project.build.outputTimestamp>
@@ -38,14 +37,14 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- used in integration testing -->
     <cal10n.version>0.8.1</cal10n.version>
-    <reload4j.version>1.2.22</reload4j.version>    
+    <reload4j.version>1.2.25</reload4j.version>
     <logback.version>1.2.10</logback.version>
     <jcl.version>1.2</jcl.version>
     <junit.version>4.13.1</junit.version>
-    <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
+    <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
-    <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+    <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
     <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
     <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
     <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -53,7 +52,6 @@
     <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
   </properties>
 
- 
 
   <dependencies>
     <dependency>
@@ -72,7 +70,7 @@
         <artifactId>reload4j</artifactId>
         <version>${reload4j.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>ch.qos.cal10n</groupId>
         <artifactId>cal10n-api</artifactId>
@@ -128,6 +126,23 @@
           <version>${maven-deploy-plugin.version}</version>
         </plugin>
 
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${maven-javadoc-plugin.version}</version>
+          <configuration>
+            <verbose>true</verbose>
+            <skippedModules>
+              slf4j-ext,log4j-over-slf4j,log4j-over-slf4j-blackbox,jul-to-slf4j-blackbox,slf4j-migrator,osgi-over-slf4j
+            </skippedModules>
+            <detectLinks>true</detectLinks>
+            <linksource>true</linksource>
+            <additionalOptions>
+              <additionalOption>-Xdoclint:none</additionalOption>
+              <additionalOption>doclint:none</additionalOption>
+            </additionalOptions>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -146,7 +161,7 @@
             <configuration>
               <release>${jdk.version}</release>
             </configuration>
-          </execution> 
+          </execution>
         </executions>
 
       </plugin>
@@ -181,19 +196,19 @@
           <supportIncrementalBuild>true</supportIncrementalBuild>
           <!-- populated by the plugin itself -->
           <instructions>
-			  <Bundle-SymbolicName>${replacestring;${project.artifactId};-;.}</Bundle-SymbolicName>
-			  <Bundle-Vendor>SLF4J.ORG</Bundle-Vendor>
-			  <_snapshot/>
-			  <_exportcontents>!META-INF.versions.9,*;-noimport:=true</_exportcontents>
-			  <Bundle-Description>${project.description}</Bundle-Description>
-			  <Bundle-DocURL>${project.url}</Bundle-DocURL>
-			  <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
-			  <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
-			  <Implementation-Version>${project.version}</Implementation-Version>
-			  <Implementation-Title>${project.artifactId}</Implementation-Title>
-			  <Multi-Release>true</Multi-Release>
-			  <_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource</_removeheaders>
-		  </instructions>
+            <Bundle-SymbolicName>${replacestring;${project.artifactId};-;.}</Bundle-SymbolicName>
+            <Bundle-Vendor>SLF4J.ORG</Bundle-Vendor>
+            <_snapshot/>
+            <_exportcontents>!META-INF.versions.9,*;-noimport:=true</_exportcontents>
+            <Bundle-Description>${project.description}</Bundle-Description>
+            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+            <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+            <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
+            <Implementation-Version>${project.version}</Implementation-Version>
+            <Implementation-Title>${project.artifactId}</Implementation-Title>
+            <Multi-Release>true</Multi-Release>
+            <_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource</_removeheaders>
+          </instructions>
         </configuration>
         <executions>
           <execution>
@@ -242,17 +257,16 @@
         <version>${maven-site-plugin.version}</version>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.0.0</version>
-      </plugin>
-    </plugins>
-  
-  </build>
+<!--      <plugin>-->
+<!--        <groupId>org.apache.maven.plugins</groupId>-->
+<!--        <artifactId>maven-javadoc-plugin</artifactId>-->
+<!--        <configuration>-->
+<!--          <skippedModules>-->
+<!--            :slf4j-ext,:log4j-over-slf4j,:log4j-over-slf4j-blackbox,jul-to-slf4j-blackbox,slf4j-migrator,:osgi-over-slf4j-->
+<!--          </skippedModules>-->
+<!--        </configuration>-->
+<!--      </plugin>-->
 
-  <reporting>
-    <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
@@ -263,56 +277,12 @@
           <linkJavadoc>true</linkJavadoc>
         </configuration>
       </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${maven-javadoc-plugin.version}</version>
-        <configuration>
-          <linkJavadoc>true</linkJavadoc>
-          <linksource>true</linksource>
-          <aggregate>true</aggregate>
-          <additionalOptions>
-            <additionalOption>-Xdoclint:none</additionalOption>
-          </additionalOptions>
-          <excludePackageNames>org.slf4j.migrator:org.slf4j.migrator.*</excludePackageNames>
-          <sourceFileExcludes>
-            <sourceFileExclude>**/module-info.java</sourceFileExclude>
-          </sourceFileExcludes>
-          
-          <groups>
-            <group>
-              <title>SLF4J packages</title>
-              <packages>org.slf4j:org.slf4j.*</packages>
-            </group>
-            
-            <group>
-              <title>SLF4J extensions</title>
-              <packages>
-                org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
-              </packages>
-            </group>
-            
-            <group>
-              <title>Jakarta Commons Logging packages</title>
-              <packages>org.apache.commons.*</packages>
-            </group>
-            
-            <group>
-              <title>java.util.logging (JUL) to SLF4J bridge</title>
-              <packages>org.slf4j.bridge</packages>
-            </group>
-            
-            <group>
-              <title>Apache log4j</title>
-              <packages>org.apache.log4j:org.apache.log4j.*</packages>
-            </group>
-          </groups>
-        </configuration>
-      </plugin>
-      
+
     </plugins>
-  </reporting>
+  </build>
+
+  <reporting>
+   </reporting>
 
   <profiles>
     <profile>
diff --git a/pom.xml b/pom.xml
index 7c11882cd..d1313211f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
     <module>log4j-over-slf4j</module>
     <module>log4j-over-slf4j-blackbox</module>
     <module>jul-to-slf4j</module>
+    <module>jul-to-slf4j-blackbox</module>
     <module>osgi-over-slf4j</module>
     <module>integration</module>
     <module>slf4j-migrator</module>
diff --git a/release.sh b/release.sh
index b1e2d933f..e72263850 100755
--- a/release.sh
+++ b/release.sh
@@ -4,7 +4,7 @@
 #JDK8 - mvn site:site
 #rscpSLF4J apidocs/ 
 
-
+# mvn -Ddoclint=none -Dmaven.javadoc.skippedModules=slf4j-ext,log4j-over-slf4j,log4j-over-slf4j-blackbox,jul-to-slf4j-blackbox,slf4j-migrator,osgi-over-slf4j javadoc:aggregate
 #mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${VERSION_NUMBER} 
 
 MVN='/java/maven-3.5.2//bin/mvn'
diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml
index 8c2c0ef50..8688f5f37 100755
--- a/slf4j-ext/pom.xml
+++ b/slf4j-ext/pom.xml
@@ -67,6 +67,7 @@
         <configuration>
           <archive>
             <manifestEntries>
+              <Automatic-Module-Name>org.slf4j.ext</Automatic-Module-Name>
               <Premain-Class>org.slf4j.agent.AgentPremain</Premain-Class>
               <!-- what is the proper way to specify the maven full name? /ravn -->
               <Boot-Class-Path>../../../../javassist/javassist/3.4.GA/javassist-3.4.GA.jar javassist-3.4.GA.jar javassist.jar</Boot-Class-Path>
diff --git a/slf4j-migrator/src/main/java/module-info.java b/slf4j-migrator/src/main/java/module-info.java
new file mode 100644
index 000000000..ecea75877
--- /dev/null
+++ b/slf4j-migrator/src/main/java/module-info.java
@@ -0,0 +1,3 @@
+module slf4j.migrator {
+    requires java.desktop;
+}
\ No newline at end of file
diff --git a/slf4j-reload4j/src/main/java/module-info.java b/slf4j-reload4j/src/main/java/module-info.java
new file mode 100644
index 000000000..956628cdb
--- /dev/null
+++ b/slf4j-reload4j/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module org.slf4j.reload4j {
+    requires org.slf4j;
+    requires ch.qos.reload4j;
+    provides org.slf4j.spi.SLF4JServiceProvider with org.slf4j.reload4j.Reload4jServiceProvider;
+}
\ No newline at end of file
diff --git a/slf4j-testing/src/main/java/module-info.java b/slf4j-testing/src/main/java/module-info.java
new file mode 100644
index 000000000..b233ae1fa
--- /dev/null
+++ b/slf4j-testing/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module org.slf4j.testing {
+    requires org.slf4j;
+    requires junit;
+    exports org.slf4j.testing;
+}
\ No newline at end of file
diff --git a/slf4j-testing/src/test/java/org/slf4j/testing/basic/NoBindingMultithreadedInitializationTest.java b/slf4j-testing/src/main/java/org/slf4j/testing/NoBindingMultithreadedInitializationTest.java
similarity index 98%
rename from slf4j-testing/src/test/java/org/slf4j/testing/basic/NoBindingMultithreadedInitializationTest.java
rename to slf4j-testing/src/main/java/org/slf4j/testing/NoBindingMultithreadedInitializationTest.java
index 6bd6e5f5b..53f140b78 100644
--- a/slf4j-testing/src/test/java/org/slf4j/testing/basic/NoBindingMultithreadedInitializationTest.java
+++ b/slf4j-testing/src/main/java/org/slf4j/testing/NoBindingMultithreadedInitializationTest.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package org.slf4j.testing.basic;
+package org.slf4j.testing;
 
 import org.junit.After;
 import org.junit.Before;