This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/bnd by this push:
new 2945dc03cc Fix filebased module names
2945dc03cc is described below
commit 2945dc03cc0299b4f1f1935c5183c12e3d7a598b
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Tue Oct 3 17:55:04 2023 +0200
Fix filebased module names
---
log4j-1.2-api/pom.xml | 2 ++
log4j-core/pom.xml | 15 ++++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 272073a8a2..bcc2228404 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -47,6 +47,8 @@
<bnd-extra-module-options>
<!-- Log4j Core is not transitive -->
org.apache.logging.log4j.core;transitive=false;static=true
+ <!-- Workaround https://github.com/bndtools/bnd/issues/5792 -->
+ javax.jms.api;substitute="javax.jms-api"
</bnd-extra-module-options>
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
</properties>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 2abe617c91..d65f138f3f 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -71,18 +71,19 @@
com.fasterxml.jackson.annotation;transitive=false,
com.lmax.disruptor;transitive=false,
disruptor;transitive=false,
- jackson-core;transitive=false,
- jackson-databind;transitive=false,
- jackson-dataformat-xml;transitive=false,
- jackson-dataformat-yaml;transitive=false,
+ com.fasterxml.jackson.core;substitute="jackson-core";transitive=false,
+
com.fasterxml.jackson.databind;substitute="jackson-databind";transitive=false,
+
com.fasterxml.jackson.dataformat.xml;substitute="jackson-dataformat-xml";transitive=false,
+
com.fasterxml.jackson.dataformat.yaml;substitute="jackson-dataformat-yaml";transitive=false,
java.compiler;transitive=false,
java.naming;transitive=false,
- javax.jms-api;transitive=false,
- javax.mail-api;transitive=false,
jeromq;transitive=false,
- kafka-clients;transitive=false,
org.apache.commons.csv;transitive=false,
org.fusesource.jansi;transitive=false
+ <!-- Workaround https://github.com/bndtools/bnd/issues/5792 -->
+ kafka.clients;substitute="kafka-clients";transitive=false,
+ javax.jms.api;substitute="javax.jms-api";transitive=false,
+ javax.mail.api;substitute="javax.mail-api";transitive=false,
</bnd-extra-module-options>
</properties>
<dependencies>
