Skip to content

Remove outdated @BaselineIgnore annotations #3133

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
Nov 3, 2024
Merged

Remove outdated @BaselineIgnore annotations #3133

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: 0 additions & 2 deletions log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4jStaticResources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
*/
package org.apache.logging.log4j.test.junit;

import aQute.bnd.annotation.baseline.BaselineIgnore;
import org.junit.jupiter.api.parallel.ResourceLock;

/**
* Constants to use the {@link ResourceLock} annotation.
*/
@BaselineIgnore("2.24.0")
public final class Log4jStaticResources {

/**
Expand Down
2 changes: 0 additions & 2 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,7 +18,6 @@

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

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

private static final Level[] EMPTY_ARRAY = {};
Expand Down
2 changes: 0 additions & 2 deletions log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.message;

import aQute.bnd.annotation.baseline.BaselineIgnore;
import com.google.errorprone.annotations.InlineMe;
import java.io.Serializable;
import org.apache.logging.log4j.util.StringBuilderFormattable;
Expand Down Expand Up @@ -257,7 +256,6 @@ public StructuredDataId makeId(final String defaultId, final String anEnterprise
*/
@Deprecated
// This method should have been `final` from the start, we don't expect anyone to override it.
@BaselineIgnore("2.22.0")
@InlineMe(replacement = "this.makeId(defaultId, String.valueOf(anEnterpriseNumber))")
public final StructuredDataId makeId(final String defaultId, final int anEnterpriseNumber) {
return makeId(defaultId, String.valueOf(anEnterpriseNumber));
Expand Down
2 changes: 0 additions & 2 deletions log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import static java.util.Objects.requireNonNull;

import aQute.bnd.annotation.baseline.BaselineIgnore;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
Expand Down Expand Up @@ -50,7 +49,6 @@
* </ol>
*/
@InternalApi
@BaselineIgnore("2.24.0")
public final class ServiceLoaderUtil {

private static final int MAX_BROKEN_SERVICES = 8;
Expand Down
2 changes: 1 addition & 1 deletion log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* There are no guarantees for binary or logical compatibility in this package.
*/
@Export
@Version("2.24.0")
@Version("2.24.1")
package org.apache.logging.log4j.util;

import org.osgi.annotation.bundle.Export;
Expand Down
3 changes: 0 additions & 3 deletions log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JsonConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,9 @@
*/
package org.apache.logging.log4j.core.jackson;

import aQute.bnd.annotation.baseline.BaselineIgnore;

/**
* Keeps constants separate from any class that may depend on third party jars.
*/
@BaselineIgnore("2.24.0")
public final class JsonConstants {
public static final String ELT_CAUSE = "cause";
public static final String ELT_CONTEXT_MAP = "contextMap";
Expand Down
2 changes: 1 addition & 1 deletion log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* library.
*/
@Export
@Version("2.24.0")
@Version("2.24.1")
package org.apache.logging.log4j.core.jackson;

import org.osgi.annotation.bundle.Export;
Expand Down
4 changes: 1 addition & 3 deletions log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@
* Log4j 2 date formatting classes.
*/
@Export
@Version("2.21.1")
@BaselineIgnore("2.22.0")
@Version("2.21.2")
package org.apache.logging.log4j.core.util.datetime;

import aQute.bnd.annotation.baseline.BaselineIgnore;
import org.osgi.annotation.bundle.Export;
import org.osgi.annotation.versioning.Version;
4 changes: 1 addition & 3 deletions log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
*/
@Export
@Header(name = Constants.BUNDLE_ACTIVATIONPOLICY, value = Constants.ACTIVATION_LAZY)
@Version("2.23.0")
@BaselineIgnore("2.23.0")
@Version("2.23.1")
package org.apache.logging.slf4j;

import aQute.bnd.annotation.baseline.BaselineIgnore;
import org.osgi.annotation.bundle.Export;
import org.osgi.annotation.bundle.Header;
import org.osgi.annotation.versioning.Version;
Expand Down