Skip to content

Commit 837ad2a

Browse files
authored
Remove outdated @BaselineIgnore annotations (#3133)
Outdated `@BaselineIgnore` annotation are no longer needed to successfully build newer versions. Until [JDK-8342833](https://bugs.openjdk.org/browse/JDK-8342833) is resolved, these annotations cause linter warnings during compilation (see #3110 for example), so it is better to remove them as soon as they are no longer used.
1 parent f592d29 commit 837ad2a

File tree

8 files changed

+3
-16
lines changed

8 files changed

+3
-16
lines changed

log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4jStaticResources.java

-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
*/
1717
package org.apache.logging.log4j.test.junit;
1818

19-
import aQute.bnd.annotation.baseline.BaselineIgnore;
2019
import org.junit.jupiter.api.parallel.ResourceLock;
2120

2221
/**
2322
* Constants to use the {@link ResourceLock} annotation.
2423
*/
25-
@BaselineIgnore("2.24.0")
2624
public final class Log4jStaticResources {
2725

2826
/**

log4j-api/src/main/java/org/apache/logging/log4j/Level.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

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

21-
import aQute.bnd.annotation.baseline.BaselineIgnore;
2221
import java.io.Serializable;
2322
import java.util.Objects;
2423
import java.util.concurrent.ConcurrentHashMap;
@@ -75,7 +74,6 @@
7574
* used in logging configurations.
7675
* </p>
7776
*/
78-
@BaselineIgnore("2.22.0")
7977
public final class Level implements Comparable<Level>, Serializable {
8078

8179
private static final Level[] EMPTY_ARRAY = {};

log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.logging.log4j.message;
1818

19-
import aQute.bnd.annotation.baseline.BaselineIgnore;
2019
import com.google.errorprone.annotations.InlineMe;
2120
import java.io.Serializable;
2221
import org.apache.logging.log4j.util.StringBuilderFormattable;
@@ -257,7 +256,6 @@ public StructuredDataId makeId(final String defaultId, final String anEnterprise
257256
*/
258257
@Deprecated
259258
// This method should have been `final` from the start, we don't expect anyone to override it.
260-
@BaselineIgnore("2.22.0")
261259
@InlineMe(replacement = "this.makeId(defaultId, String.valueOf(anEnterpriseNumber))")
262260
public final StructuredDataId makeId(final String defaultId, final int anEnterpriseNumber) {
263261
return makeId(defaultId, String.valueOf(anEnterpriseNumber));

log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java

-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static java.util.Objects.requireNonNull;
2020

21-
import aQute.bnd.annotation.baseline.BaselineIgnore;
2221
import java.util.Collection;
2322
import java.util.HashSet;
2423
import java.util.Iterator;
@@ -50,7 +49,6 @@
5049
* </ol>
5150
*/
5251
@InternalApi
53-
@BaselineIgnore("2.24.0")
5452
public final class ServiceLoaderUtil {
5553

5654
private static final int MAX_BROKEN_SERVICES = 8;

log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* There are no guarantees for binary or logical compatibility in this package.
2121
*/
2222
@Export
23-
@Version("2.24.0")
23+
@Version("2.24.1")
2424
package org.apache.logging.log4j.util;
2525

2626
import org.osgi.annotation.bundle.Export;

log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JsonConstants.java

-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@
1616
*/
1717
package org.apache.logging.log4j.core.jackson;
1818

19-
import aQute.bnd.annotation.baseline.BaselineIgnore;
20-
2119
/**
2220
* Keeps constants separate from any class that may depend on third party jars.
2321
*/
24-
@BaselineIgnore("2.24.0")
2522
public final class JsonConstants {
2623
public static final String ELT_CAUSE = "cause";
2724
public static final String ELT_CONTEXT_MAP = "contextMap";

log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* library.
2020
*/
2121
@Export
22-
@Version("2.24.0")
22+
@Version("2.24.1")
2323
package org.apache.logging.log4j.core.jackson;
2424

2525
import org.osgi.annotation.bundle.Export;

log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/package-info.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
*/
2222
@Export
2323
@Header(name = Constants.BUNDLE_ACTIVATIONPOLICY, value = Constants.ACTIVATION_LAZY)
24-
@Version("2.23.0")
25-
@BaselineIgnore("2.23.0")
24+
@Version("2.23.1")
2625
package org.apache.logging.slf4j;
2726

28-
import aQute.bnd.annotation.baseline.BaselineIgnore;
2927
import org.osgi.annotation.bundle.Export;
3028
import org.osgi.annotation.bundle.Header;
3129
import org.osgi.annotation.versioning.Version;

0 commit comments

Comments
 (0)