More JPMS fine-tunings (#1895)

apache · Oct 25, 2023 · bfdc861 · bfdc861
1 parent 945cbc8
commit bfdc861
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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>