Skip to content

[log4j-to-slf4j] Adapt OSGi metadata to work with slf4j 1 and 2 #1375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2023
Merged

[log4j-to-slf4j] Adapt OSGi metadata to work with slf4j 1 and 2 #1375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions log4j-to-slf4j/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<docLabel>SLF4J Documentation</docLabel>
<projectDir>/log4j-to-slf4j</projectDir>
<module.name>org.apache.logging.slf4j</module.name>
<slf4j.support.bound>3</slf4j.support.bound>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -97,6 +98,7 @@
<instructions>
<Bundle-Activator>org.apache.logging.slf4j.Activator</Bundle-Activator>
<Export-Package>org.apache.logging.slf4j</Export-Package>
<Import-Package>org.slf4j*;version="${range;[==,${slf4j.support.bound})}",*</Import-Package>
</instructions>
</configuration>
</plugin>
Expand Down
29 changes: 29 additions & 0 deletions src/changelog/.2.x.x/1232_log4j-to-sfl4j-2-OSGiMetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.0.xsd"
type="fixed">
<issue id="1232" link="https://github.com/apache/logging-log4j2/issues/1232"/>
<author id="hanneswell"/>
<author name="Hannes Wellmann"/>
<description format="asciidoc">
Adapt the OSGi metadata of log4j-to-slf4j to work with slf4j 1 and 2.
To achieve that use a version range of `[1.7,3)` for the imported slf4j packages.
</description>
</entry>