You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/10/01 08:32:00 UTC
(logging-log4j2) branch fix/2.x/remove-bnd-bnd created (now c89ca055ec)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch fix/2.x/remove-bnd-bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
at c89ca055ec Move BND configuration to `pom.xml`
This branch includes the following new commits:
new c89ca055ec Move BND configuration to `pom.xml`
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(logging-log4j2) 01/01: Move BND configuration to `pom.xml`
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch fix/2.x/remove-bnd-bnd
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c89ca055eca3bfe65f3b3270b688072ee44a2101
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Tue Oct 1 10:31:41 2024 +0200
Move BND configuration to `pom.xml`
This removes the BND configuration in `log4j-1.2-api/bnd.bnd` and moves it to the POM file.
The resulting JPMS module has the same requirements as version `2.24.1`.
```
requires java.base
requires java.desktop
requires java.management transitive
requires java.xml transitive
requires javax.jms-api static
requires org.apache.logging.log4j transitive
requires org.apache.logging.log4j.core static
```
---
log4j-1.2-api/bnd.bnd | 27 ---------------------------
log4j-1.2-api/pom.xml | 7 ++++---
2 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/log4j-1.2-api/bnd.bnd b/log4j-1.2-api/bnd.bnd
deleted file mode 100644
index 4ea244d57f..0000000000
--- a/log4j-1.2-api/bnd.bnd
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to you under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-##
-# Overrides the defaults in `logging-parent`.
-#
-
-# JPMS module options
--jpms-module-info-options = \
- org.osgi.core;static=true;transitive=false,\
- org.osgi.framework;static=true;transitive=false,\
- org.apache.logging.log4j;substitute="log4j-api",\
- org.apache.logging.log4j.core;substitute="log4j-core";transitive=false;static=true,\
- javax.jms.api;substitute="javax.jms-api"
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 097921ad56..fc2ada6378 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -43,11 +43,12 @@
com.sun.jdmk.comm;resolution:=optional,
<!-- JMS is optional -->
javax.jms;version="[1.1,3)";resolution:=optional,
- <!-- Log4j Core is optional -->
- org.apache.logging.log4j.core.*;resolution:=optional
</bnd-extra-package-options>
+ <bnd-extra-module-options>
+ <!-- Log4j Core is optional -->
+ org.apache.logging.log4j.core;static=true
+ </bnd-extra-module-options>
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <!-- we have an `bnd.bnd` file to override the parent's defaults -->
</properties>
<dependencies>