diff --git a/jcl-over-slf4j-blackbox/pom.xml b/jcl-over-slf4j-blackbox/pom.xml index 76174fcc5..1e92eda1a 100644 --- a/jcl-over-slf4j-blackbox/pom.xml +++ b/jcl-over-slf4j-blackbox/pom.xml @@ -26,7 +26,7 @@ - + ${jdk9.version} diff --git a/jcl-over-slf4j/src/main/java/module-info.java b/jcl-over-slf4j/src/main/java9/module-info.java old mode 100755 new mode 100644 similarity index 100% rename from jcl-over-slf4j/src/main/java/module-info.java rename to jcl-over-slf4j/src/main/java9/module-info.java diff --git a/jul-to-slf4j/src/main/java/module-info.java b/jul-to-slf4j/src/main/java9/module-info.java similarity index 100% rename from jul-to-slf4j/src/main/java/module-info.java rename to jul-to-slf4j/src/main/java9/module-info.java diff --git a/log4j-over-slf4j-blackbox/pom.xml b/log4j-over-slf4j-blackbox/pom.xml index b7e1784db..7a37ae3d1 100644 --- a/log4j-over-slf4j-blackbox/pom.xml +++ b/log4j-over-slf4j-blackbox/pom.xml @@ -26,7 +26,7 @@ - + ${jdk9.version} diff --git a/log4j-over-slf4j/src/main/java/module-info.java b/log4j-over-slf4j/src/main/java9/module-info.java old mode 100755 new mode 100644 similarity index 100% rename from log4j-over-slf4j/src/main/java/module-info.java rename to log4j-over-slf4j/src/main/java9/module-info.java diff --git a/parent/pom.xml b/parent/pom.xml index 5009f5cdc..7e17a164a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -29,9 +29,12 @@ 2023-12-28T23:04:51Z 1.7.36 - 11 + 8 + + 9 ${jdk.version} ${jdk.version} + UTF-8 UTF-8 UTF-8 @@ -145,6 +148,31 @@ ${jdk.version} + + + default-testCompile + + testCompile + + + ${jdk.version} + + + + + module-compile + compile + + compile + + + 9 + + ${project.basedir}/src/main/java9 + + true + + diff --git a/pom.xml b/pom.xml index 452a38f8d..a5a3872c6 100755 --- a/pom.xml +++ b/pom.xml @@ -45,11 +45,11 @@ jcl-over-slf4j-blackbox log4j-over-slf4j log4j-over-slf4j-blackbox - jul-to-slf4j - jul-to-slf4j-blackbox - osgi-over-slf4j - integration - slf4j-migrator + + + + + @@ -166,7 +166,7 @@ true - slf4j-testing,slf4j-ext,log4j-over-slf4j,log4j-over-slf4j-blackbox,jul-to-slf4j-blackbox,slf4j-migrator,osgi-over-slf4j + slf4j-testing,slf4j-jdk-platform-logging,jcl-over-slf4j-blackbox,log4j-over-slf4j-blackbox,jul-to-slf4j-blackbox,slf4j-migrator,osgi-over-slf4j true SLF4J project modules 2.1.0-alpha0 @@ -176,6 +176,58 @@ -Xdoclint:none + + + SLF4J API packages + org.slf4j:org.slf4j.spi:org.slf4j.event:org.slf4j.helpers + + + + slf4j-simple package + org.slf4j.simple + + + + slf4j-nop package + org.slf4j.nop + + + + + slf4j-jdk14 package + org.slf4j.jul + + + + + slf4j-reload4j package + org.slf4j.reload4j + + + + + SLF4J extensions + + org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent + + + + + Jakarta Commons Logging packages + org.apache.commons.* + + + + java.util.logging (JUL) to SLF4J bridge + org.slf4j.bridge + + + + log4j-over-slf4j redirection + org.apache.log4j:org.apache.log4j.* + + + diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index ea3baaac5..ee9851732 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -59,7 +59,8 @@ maven-bundle-plugin - org.slf4j.spi;version="${range;[===,+);${version_cleanup;${project.version}}}" + org.slf4j.spi;version="${range;[===,+);${version_cleanup;${project.version}}}" + <_exportcontents> - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + module-compile + compile + + compile + + + ${jdk9.version} + + ${project.basedir}/src/main/java9 + + true + + + + + diff --git a/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java b/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java index 6c9df405a..95bc489aa 100755 --- a/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java @@ -11,7 +11,7 @@ *

*

As the name indicates, the methods in this class do nothing. In case a return value is expected, a singleton, * i.e. the unique instance of this class, is returned. - *

*

*

Note that the default implementations of {@link Logger#atTrace()}, {@link Logger#atDebug()} , {@link Logger#atInfo()}, * {@link Logger#atWarn()} and {@link Logger#atError()}, return an instance of {@link NOPLoggingEventBuilder} diff --git a/slf4j-api/src/main/java/module-info.java b/slf4j-api/src/main/java9/module-info.java similarity index 100% rename from slf4j-api/src/main/java/module-info.java rename to slf4j-api/src/main/java9/module-info.java diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index aae107688..c83a3ce5b 100755 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -67,7 +67,7 @@ - org.slf4j.ext + org.slf4j.agent.AgentPremain ../../../../javassist/javassist/3.4.GA/javassist-3.4.GA.jar javassist-3.4.GA.jar javassist.jar diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml index 349704a79..b3c5e511a 100644 --- a/slf4j-jdk-platform-logging/pom.xml +++ b/slf4j-jdk-platform-logging/pom.xml @@ -19,6 +19,10 @@ https://www.slf4j.org + + ${jdk9.version} + + org.slf4j @@ -36,35 +40,35 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - default-compile - - compile - - - 9 - 9 - 9 - - - - default-testCompile - - testCompile - - - 9 - 9 - 9 - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 5c59ff474..a56e07f6c 100755 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -38,4 +38,33 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + + module-compile + compile + + compile + + + ${jdk9.version} + + ${project.basedir}/src/main/java9 + + true + + + + + + + + + diff --git a/slf4j-jdk14/src/main/java/module-info.java b/slf4j-jdk14/src/main/java9/module-info.java similarity index 100% rename from slf4j-jdk14/src/main/java/module-info.java rename to slf4j-jdk14/src/main/java9/module-info.java diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 208b7a4fe..d89f1fe2c 100755 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -38,4 +38,30 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + + module-compile + compile + + compile + + + ${jdk9.version} + + ${project.basedir}/src/main/java9 + + true + + + + + + diff --git a/slf4j-nop/src/main/java/module-info.java b/slf4j-nop/src/main/java9/module-info.java old mode 100755 new mode 100644 similarity index 100% rename from slf4j-nop/src/main/java/module-info.java rename to slf4j-nop/src/main/java9/module-info.java diff --git a/slf4j-reload4j/src/main/java/module-info.java b/slf4j-reload4j/src/main/java9/module-info.java similarity index 100% rename from slf4j-reload4j/src/main/java/module-info.java rename to slf4j-reload4j/src/main/java9/module-info.java diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index a5b849070..c64255636 100755 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -19,6 +19,7 @@ org.slf4j.simple + org.slf4j.simple.SimpleServiceProvider simple @@ -38,4 +39,32 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + + + module-compile + compile + + compile + + + ${jdk9.version} + + ${project.basedir}/src/main/java9 + + true + + + + + + + + diff --git a/slf4j-simple/src/main/java/module-info.java b/slf4j-simple/src/main/java9/module-info.java old mode 100755 new mode 100644 similarity index 100% rename from slf4j-simple/src/main/java/module-info.java rename to slf4j-simple/src/main/java9/module-info.java diff --git a/slf4j-testing/pom.xml b/slf4j-testing/pom.xml index 19127c061..7a2d2af6b 100644 --- a/slf4j-testing/pom.xml +++ b/slf4j-testing/pom.xml @@ -14,11 +14,13 @@ slf4j-testing jar SLF4J Common Testing - SLF4J Common testing + SLF4J Common testing http://www.slf4j.org + ${jdk9.version} org.slf4j.testing + ${jdk9.version} @@ -44,6 +46,24 @@ true + + + + + + + + + + + + + + + + + +