[logging-log4j2] branch 2.x updated: More JPMS fine-tunings (#1895)

[vy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.x by this push:
     new bfdc8617b6 More JPMS fine-tunings (#1895)
bfdc8617b6 is described below

commit bfdc8617b617ed7af3f55458c50fdac762d6ac7c
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Wed Oct 25 09:54:30 2023 +0200

    More JPMS fine-tunings (#1895)
---
 log4j-core/pom.xml                 | 4 ++--
 log4j-layout-template-json/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 1d903dde10..15c17c2f66 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -62,8 +62,8 @@
       javax.naming;resolution:=optional
     </bnd-extra-package-options>
     <bnd-extra-module-options>
-      <!-- OSGI is optional in JPMS -->
-      org.osgi.core;static=true,
+      <!-- OSGI is optional in JPMS and it shouldn't be transitive either (#1895) -->
+      org.osgi.core;static=true;transitive=false,
       <!-- BND seems to always add `java.logging` (dependency of `java.sql`) -->
       java.logging;static=true,
       java.sql;static=true,
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 8a51a3eafb..bf0cc3c1c3 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -43,8 +43,8 @@
       -->
     <bnd-module-name>org.apache.logging.log4j.layout.template.json</bnd-module-name>
     <bnd-extra-module-options>
-      <!-- Correct module names -->
-      org.jctools.core;substitute="jctools-core"
+      <!-- JCTools is optional (#1895) -->
+      org.jctools.core;substitute="jctools-core";static=true
     </bnd-extra-module-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>