This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch feature/2.x/2929_remove_transitive_static in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 979caf476c30ad1cc03a3896f70559d3d6c6767c Author: Piotr P. Karwasz <[email protected]> AuthorDate: Sun Sep 8 11:35:33 2024 +0200 Remove `transitive` from optional dependencies We remove the `transitive` modifier from all optional dependencies. Closes #2929. --- log4j-api/pom.xml | 4 +++- log4j-core/pom.xml | 1 + log4j-to-jul/pom.xml | 4 ++++ log4j-to-slf4j/pom.xml | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index 5423c4f99f..4b0525466d 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -54,7 +54,9 @@ <!-- Used in StringBuilders through reflection --> java.sql;static=true, <!-- Used in ProcessIdUtil through reflection --> - java.management;static=true + java.management;static=true, + <!-- Remove `transitive` for optional dependencies --> + org.jspecify;transitive=false </bnd-extra-module-options> </properties> diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index 7976c800b5..1e35ebce72 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -98,6 +98,7 @@ java.naming;transitive=false, org.apache.commons.csv;transitive=false, org.fusesource.jansi;transitive=false, + org.jspecify;transitive=false, org.zeromq.jeromq;transitive=false, <!-- A module descriptor is only available in version 1.2.16+, hence it is not detected --> com.conversantmedia.disruptor;substitute="disruptor";transitive=false;static=true, diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml index 25caed1639..54899fad28 100644 --- a/log4j-to-jul/pom.xml +++ b/log4j-to-jul/pom.xml @@ -34,6 +34,10 @@ <!-- Annotations only --> org.jspecify.*;resolution:=optional </bnd-extra-package-options> + <bnd-extra-module-options> + <!-- Remove `transitive` for optional dependencies --> + org.jspecify;transitive=false + </bnd-extra-module-options> </properties> <dependencies> diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index 45907097dc..50732f24c9 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -45,6 +45,10 @@ <!-- This bridge also support SLF4J 2.x --> org.slf4j.*;version="${slf4j.support.range}" </bnd-extra-package-options> + <bnd-extra-module-options> + <!-- Remove `transitive` for optional dependencies --> + org.jspecify;transitive=false + </bnd-extra-module-options> <slf4j2.version>2.0.16</slf4j2.version> </properties>
