From 2af556252c2fbcbe86468f48f79906bef3e7e271 Mon Sep 17 00:00:00 2001 From: ceki Date: Tue, 16 Dec 2025 17:57:15 +0100 Subject: [PATCH] required JDK to 11 Signed-off-by: ceki --- jcl-over-slf4j-blackbox/pom.xml | 1 - .../src/main/{java9 => java}/module-info.java | 0 jul-to-slf4j-blackbox/pom.xml | 1 - log4j-over-slf4j-blackbox/pom.xml | 1 - .../src/main/{java9 => java}/module-info.java | 0 parent/pom.xml | 29 +--------- slf4j-api/pom.xml | 22 -------- .../src/main/{java9 => java}/module-info.java | 0 slf4j-jdk-platform-logging/pom.xml | 32 ----------- slf4j-jdk14/pom.xml | 24 -------- .../src/main/{java9 => java}/module-info.java | 0 .../src/main/{java9 => java}/module-info.java | 0 slf4j-nop/pom.xml | 22 -------- .../src/main/{java9 => java}/module-info.java | 0 .../nop/MultithreadedInitializationTest.java | 2 + slf4j-reload4j/pom.xml | 55 +++++++++++++++---- .../src/main/{java9 => java}/module-info.java | 0 slf4j-simple/pom.xml | 22 -------- .../src/main/{java9 => java}/module-info.java | 0 slf4j-testing/pom.xml | 20 ------- .../MultithreadedInitializationTest.java | 15 +++-- 21 files changed, 55 insertions(+), 191 deletions(-) rename jcl-over-slf4j/src/main/{java9 => java}/module-info.java (100%) rename log4j-over-slf4j/src/main/{java9 => java}/module-info.java (100%) rename slf4j-api/src/main/{java9 => java}/module-info.java (100%) rename slf4j-jdk14/src/main/{java9 => java}/module-info.java (100%) rename slf4j-migrator/src/main/{java9 => java}/module-info.java (100%) rename slf4j-nop/src/main/{java9 => java}/module-info.java (100%) rename slf4j-reload4j/src/main/{java9 => java}/module-info.java (100%) rename slf4j-simple/src/main/{java9 => java}/module-info.java (100%) diff --git a/jcl-over-slf4j-blackbox/pom.xml b/jcl-over-slf4j-blackbox/pom.xml index 953afe58..b6fde091 100644 --- a/jcl-over-slf4j-blackbox/pom.xml +++ b/jcl-over-slf4j-blackbox/pom.xml @@ -26,7 +26,6 @@ - ${jdk9.version} diff --git a/jcl-over-slf4j/src/main/java9/module-info.java b/jcl-over-slf4j/src/main/java/module-info.java similarity index 100% rename from jcl-over-slf4j/src/main/java9/module-info.java rename to jcl-over-slf4j/src/main/java/module-info.java diff --git a/jul-to-slf4j-blackbox/pom.xml b/jul-to-slf4j-blackbox/pom.xml index 84ec6dfb..069ef23e 100644 --- a/jul-to-slf4j-blackbox/pom.xml +++ b/jul-to-slf4j-blackbox/pom.xml @@ -26,7 +26,6 @@ - ${jdk9.version} diff --git a/log4j-over-slf4j-blackbox/pom.xml b/log4j-over-slf4j-blackbox/pom.xml index ebe95704..d8c981bc 100644 --- a/log4j-over-slf4j-blackbox/pom.xml +++ b/log4j-over-slf4j-blackbox/pom.xml @@ -26,7 +26,6 @@ - ${jdk9.version} diff --git a/log4j-over-slf4j/src/main/java9/module-info.java b/log4j-over-slf4j/src/main/java/module-info.java similarity index 100% rename from log4j-over-slf4j/src/main/java9/module-info.java rename to log4j-over-slf4j/src/main/java/module-info.java diff --git a/parent/pom.xml b/parent/pom.xml index 8a2a9f92..8cbad002 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -29,9 +29,7 @@ 2024-01-02T19:42:00Z 1.7.36 - 8 - - 9 + 11 ${jdk.version} ${jdk.version} @@ -148,31 +146,6 @@ ${jdk.version} - - - default-testCompile - - testCompile - - - ${jdk.version} - - - - - module-compile - compile - - compile - - - 9 - - ${project.basedir}/src/main/java9 - - true - - diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 131728a1..2d2b0f82 100755 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -75,28 +75,6 @@ - - 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/java9/module-info.java b/slf4j-api/src/main/java/module-info.java similarity index 100% rename from slf4j-api/src/main/java9/module-info.java rename to slf4j-api/src/main/java/module-info.java diff --git a/slf4j-jdk-platform-logging/pom.xml b/slf4j-jdk-platform-logging/pom.xml index ac81709d..8b5c389b 100644 --- a/slf4j-jdk-platform-logging/pom.xml +++ b/slf4j-jdk-platform-logging/pom.xml @@ -20,7 +20,6 @@ https://www.slf4j.org - ${jdk9.version} @@ -39,37 +38,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index 60ec9360..555369ea 100755 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -40,31 +40,7 @@ - - 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/java9/module-info.java b/slf4j-jdk14/src/main/java/module-info.java similarity index 100% rename from slf4j-jdk14/src/main/java9/module-info.java rename to slf4j-jdk14/src/main/java/module-info.java diff --git a/slf4j-migrator/src/main/java9/module-info.java b/slf4j-migrator/src/main/java/module-info.java similarity index 100% rename from slf4j-migrator/src/main/java9/module-info.java rename to slf4j-migrator/src/main/java/module-info.java diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 3718ec46..7efa36cb 100755 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -40,28 +40,6 @@ - - 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/java9/module-info.java b/slf4j-nop/src/main/java/module-info.java similarity index 100% rename from slf4j-nop/src/main/java9/module-info.java rename to slf4j-nop/src/main/java/module-info.java diff --git a/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java b/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java index 25cecb15..13062aab 100755 --- a/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java +++ b/slf4j-nop/src/test/java/org/slf4j/nop/MultithreadedInitializationTest.java @@ -31,6 +31,8 @@ import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactoryFriend; import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; import java.util.Random; import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; diff --git a/slf4j-reload4j/pom.xml b/slf4j-reload4j/pom.xml index 4a1cbc9c..8abcc9f7 100644 --- a/slf4j-reload4j/pom.xml +++ b/slf4j-reload4j/pom.xml @@ -52,18 +52,53 @@ org.apache.maven.plugins maven-surefire-plugin - 1 - false - plain - false - - **/AllTest.java - **/PackageTest.java - - - + + + --add-opens org.slf4j.reload4j/org.slf4j.reload4j.testHarness=ch.qos.reload4j + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/slf4j-reload4j/src/main/java9/module-info.java b/slf4j-reload4j/src/main/java/module-info.java similarity index 100% rename from slf4j-reload4j/src/main/java9/module-info.java rename to slf4j-reload4j/src/main/java/module-info.java diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 2e182389..7d8ce2c1 100755 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -41,28 +41,6 @@ - - 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/java9/module-info.java b/slf4j-simple/src/main/java/module-info.java similarity index 100% rename from slf4j-simple/src/main/java9/module-info.java rename to slf4j-simple/src/main/java/module-info.java diff --git a/slf4j-testing/pom.xml b/slf4j-testing/pom.xml index 80d89134..338b2f8b 100644 --- a/slf4j-testing/pom.xml +++ b/slf4j-testing/pom.xml @@ -18,9 +18,7 @@ http://www.slf4j.org - ${jdk9.version} org.slf4j.testing - ${jdk9.version} @@ -46,24 +44,6 @@ true - - - - - - - - - - - - - - - - - - diff --git a/slf4j-testing/src/main/java/org/slf4j/testing/MultithreadedInitializationTest.java b/slf4j-testing/src/main/java/org/slf4j/testing/MultithreadedInitializationTest.java index 0cb1ea25..4caedc6d 100644 --- a/slf4j-testing/src/main/java/org/slf4j/testing/MultithreadedInitializationTest.java +++ b/slf4j-testing/src/main/java/org/slf4j/testing/MultithreadedInitializationTest.java @@ -1,7 +1,10 @@ package org.slf4j.testing; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.event.EventRecordingLogger; +import org.slf4j.helpers.SubstituteLogger; import java.util.ArrayList; import java.util.Collections; @@ -10,14 +13,10 @@ import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.event.EventRecordingLogger; -import org.slf4j.helpers.SubstituteLogger; +import static org.junit.Assert.fail; abstract public class MultithreadedInitializationTest { - final protected static int THREAD_COUNT = 4 + Runtime.getRuntime().availableProcessors() * 2; + final protected static int THREAD_COUNT = 1;//4 + Runtime.getRuntime().availableProcessors() * 2; private final List createdLoggers = Collections.synchronizedList(new ArrayList<>());