(logging-log4j2) branch main updated: Marks `jctools-core` as optional in OSGi/JPMS

[pk...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 6ae16eddfd Marks `jctools-core` as optional in OSGi/JPMS
6ae16eddfd is described below

commit 6ae16eddfdfb74b67a4dcc0778ce9c3e68070196
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu Nov 23 11:18:26 2023 +0100

    Marks `jctools-core` as optional in OSGi/JPMS
    
    This adds an optional resolution for `jctools-core` to the OSGi
    descriptor of `log4j-api`.
---
 log4j-api/pom.xml                  | 4 ++++
 log4j-layout-template-json/pom.xml | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index a270a53c96..ace7342371 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -34,6 +34,10 @@
       ~ OSGi and JPMS options
       -->
     <bnd-module-name>org.apache.logging.log4j</bnd-module-name>
+    <bnd-extra-package-options>
+      <!-- Optional dependencies -->
+      org.jctools.*;resolution:=optional
+    </bnd-extra-package-options>
     <bnd-extra-module-options>
       <!-- Used in StringBuilders through reflection -->
       java.sql;static=true
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 957d076482..310c7632f0 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -38,10 +38,6 @@
       ~ OSGi and JPMS options
       -->
     <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"
-    </bnd-extra-module-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
   </properties>