Skip to content

Restore compatibility of Log4j API #2203

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 2 commits into from
Jan 26, 2024
Merged

Restore compatibility of Log4j API #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff06e7
Restore compatibility of Log4j API
ppkarwasz Jan 16, 2024
65a837b
Add `since` to methods/types scheduled for removal
ppkarwasz Jan 17, 2024
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
1 change: 1 addition & 0 deletions log4j-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<description>The Apache Log4j API</description>
<properties>
<maven.javadoc.skip>false</maven.javadoc.skip>
<bnd.baseline.skip>false</bnd.baseline.skip>

<!--
~ OSGi and JPMS options
Expand Down
2 changes: 2 additions & 0 deletions log4j-api/src/main/java/org/apache/logging/log4j/Level.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static org.apache.logging.log4j.util.Strings.toRootUpperCase;

import aQute.bnd.annotation.baseline.BaselineIgnore;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Expand Down Expand Up @@ -71,6 +72,7 @@
* used in logging configurations.
* </p>
*/
@BaselineIgnore("3.0.0")
public final class Level implements Comparable<Level> {

private static final Level[] EMPTY_ARRAY = {};
Expand Down
8 changes: 7 additions & 1 deletion log4j-api/src/main/java/org/apache/logging/log4j/LogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@
public class LogManager {

/**
* Constant holding the name of the root logger (the empty string).
* Kept for binary compatibility.
*/
@Deprecated(forRemoval = true)
public static final String FACTORY_PROPERTY_NAME = "log4j2.loggerContextFactory";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose we can keep these strings, but by 3.0.0, they'll be functionally useless due to #1977

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is actually a compatibility mechanism developed by Ralph (cf. log4j2.propertyMapping.json) that allows log4j2.loggerContextFactory to still work.

I had doubts about reintroducing this: it is a compile-time constant, so it will be inlined in all binary artifacts. As far as source compatibility is concerned, I think we could remove it. What do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I mean is that specifying custom classes to use for things will likely use some sort of code-based way of doing so rather than a system property.


/**
* The name of the root Logger is {@value #ROOT_LOGGER_NAME}.
*/
public static final String ROOT_LOGGER_NAME = Strings.EMPTY;

Expand Down
Loading