diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml index aef8a1b5d64..a30086d2b5a 100644 --- a/log4j-api-test/pom.xml +++ b/log4j-api-test/pom.xml @@ -69,102 +69,124 @@ ~ It is used in StackLocatorUtilTest through a Class.forName --> + org.apache.logging.log4j log4j-api + org.apache.commons commons-lang3 + org.hamcrest hamcrest + junit junit + org.junit.jupiter junit-jupiter-api + org.junit-pioneer junit-pioneer + org.junit.platform junit-platform-commons + org.apache.maven maven-core + org.apache.maven maven-model + org.codehaus.plexus plexus-utils + org.assertj assertj-core + com.fasterxml.jackson.core jackson-core test + com.fasterxml.jackson.core jackson-databind test + org.junit.jupiter junit-jupiter-engine test + org.junit.jupiter junit-jupiter-params test + org.mockito mockito-core + org.mockito mockito-inline test + org.jspecify jspecify test + org.osgi org.osgi.core test + uk.org.webcompere system-stubs-core test + uk.org.webcompere system-stubs-jupiter test + diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index 4b0525466df..58dbd02a61d 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -47,7 +47,7 @@ !sun.reflect, - + org.jspecify.*;resolution:=optional @@ -63,16 +63,17 @@ - org.jspecify - jspecify + org.osgi + org.osgi.core provided - org.osgi - org.osgi.core + org.jspecify + jspecify provided + diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index 8c8cbc19bbd..7e13dee6640 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -254,6 +254,7 @@ jspecify test + com.sun.mail javax.mail diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index f5693dc2e92..6d0565627ad 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -53,7 +53,7 @@ --> true - + org.jspecify.*;resolution:=optional, com.conversantmedia.util.concurrent;resolution:=optional; @@ -108,12 +108,14 @@ + javax.activation javax.activation-api provided true + javax.jms @@ -121,6 +123,7 @@ provided true + javax.mail @@ -128,94 +131,112 @@ provided true - - org.jspecify - jspecify - provided - + org.osgi org.osgi.core provided + org.apache.logging.log4j log4j-api + org.apache.commons commons-compress true + org.apache.commons commons-csv true + com.conversantmedia disruptor true + com.lmax disruptor true + com.fasterxml.jackson.core jackson-core true + com.fasterxml.jackson.core jackson-databind true + com.fasterxml.jackson.dataformat jackson-dataformat-xml true + com.fasterxml.jackson.dataformat jackson-dataformat-yaml true + org.jctools jctools-core true + org.zeromq jeromq true + + + + org.jspecify + jspecify + + org.apache.kafka kafka-clients true + com.sun.mail javax.mail runtime true + diff --git a/log4j-fuzz-test/pom.xml b/log4j-fuzz-test/pom.xml index 8c76b205a08..1a608aeac6a 100644 --- a/log4j-fuzz-test/pom.xml +++ b/log4j-fuzz-test/pom.xml @@ -41,6 +41,15 @@ 20250107 + + + org.jspecify.*;resolution:=optional + + + + org.jspecify;transitive=false + + @@ -50,10 +59,12 @@ log4j-core + org.jspecify jspecify - provided diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml index a05ff111e71..bb1661e0a9c 100644 --- a/log4j-taglib/pom.xml +++ b/log4j-taglib/pom.xml @@ -32,7 +32,7 @@ ~ OSGi and JPMS options --> - + org.jspecify.*;resolution:=optional @@ -44,55 +44,69 @@ org.apache.logging.log4j.core + + javax.servlet.jsp javax.servlet.jsp-api provided + javax.servlet javax.servlet-api provided + org.apache.logging.log4j log4j-api + org.apache.logging.log4j log4j-web true + + org.jspecify jspecify - provided + org.apache.logging.log4j log4j-core test + org.apache.logging.log4j log4j-core-test test + commons-logging commons-logging test + org.junit.jupiter junit-jupiter-engine test + org.springframework spring-test test + diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml index 54899fad282..3d683e2319e 100644 --- a/log4j-to-jul/pom.xml +++ b/log4j-to-jul/pom.xml @@ -31,7 +31,7 @@ - + org.jspecify.*;resolution:=optional @@ -41,39 +41,49 @@ - - org.jspecify - jspecify - provided - + org.osgi org.osgi.core provided + org.apache.logging.log4j log4j-api + + + + org.jspecify + jspecify + + org.assertj assertj-core test + com.google.guava guava-testlib test + org.junit.jupiter junit-jupiter-engine test + org.junit.vintage junit-vintage-engine test + diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index 68f305133aa..1120f846017 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -40,7 +40,7 @@ --> [1.7,3) - + org.jspecify.*;resolution:=optional, org.slf4j.*;version="${slf4j.support.range}" @@ -64,70 +64,86 @@ + org.osgi org.osgi.core provided - - org.jspecify - jspecify - provided - + org.apache.logging.log4j log4j-api + + + + org.jspecify + jspecify + + org.slf4j slf4j-api + org.assertj assertj-core test + org.hamcrest hamcrest test + org.junit.jupiter junit-jupiter-engine test + org.junit.jupiter junit-jupiter-params test + ch.qos.logback logback-classic test + ch.qos.logback logback-core test + ch.qos.logback logback-core test-jar test + org.apache.logging.log4j log4j-api-test test + org.mockito mockito-core test + diff --git a/pom.xml b/pom.xml index bce5e5cc036..19d842dfd92 100644 --- a/pom.xml +++ b/pom.xml @@ -968,19 +968,6 @@ - - - - org.jspecify - jspecify - ${jspecify.version} - test - - -