From dfb429321ab912e13c6be5b8bc131080185756d9 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Mon, 28 Oct 2024 20:52:56 +0100 Subject: [PATCH] Remove outdated `@BaselineIgnore` annotations 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. --- .../apache/logging/log4j/test/junit/Log4jStaticResources.java | 2 -- log4j-api/src/main/java/org/apache/logging/log4j/Level.java | 2 -- .../org/apache/logging/log4j/message/StructuredDataId.java | 2 -- .../java/org/apache/logging/log4j/util/ServiceLoaderUtil.java | 2 -- .../main/java/org/apache/logging/log4j/util/package-info.java | 2 +- .../org/apache/logging/log4j/core/jackson/JsonConstants.java | 3 --- .../org/apache/logging/log4j/core/jackson/package-info.java | 2 +- .../apache/logging/log4j/core/util/datetime/package-info.java | 4 +--- .../src/main/java/org/apache/logging/slf4j/package-info.java | 4 +--- 9 files changed, 4 insertions(+), 19 deletions(-) diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4jStaticResources.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4jStaticResources.java index 0b3e2698524..b387ed095ac 100644 --- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4jStaticResources.java +++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Log4jStaticResources.java @@ -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 { /** diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java index 9f8e7863269..47a6fc6367e 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/Level.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/Level.java @@ -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; @@ -75,7 +74,6 @@ * used in logging configurations. *

*/ -@BaselineIgnore("2.22.0") public final class Level implements Comparable, Serializable { private static final Level[] EMPTY_ARRAY = {}; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java index c323e876687..306e18f1277 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java @@ -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; @@ -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)); diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java index 30b56f83b56..cbd0b4de0b6 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ServiceLoaderUtil.java @@ -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; @@ -50,7 +49,6 @@ * */ @InternalApi -@BaselineIgnore("2.24.0") public final class ServiceLoaderUtil { private static final int MAX_BROKEN_SERVICES = 8; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java index 757248862a2..ea9e726d424 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/package-info.java @@ -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; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JsonConstants.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JsonConstants.java index 62be0bc537f..cd269a6f76b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JsonConstants.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/JsonConstants.java @@ -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"; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java index 2f6ac1a50fe..4f6573c2cf4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/package-info.java @@ -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; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java index dd5eea74619..a0158a556d2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java @@ -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; diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/package-info.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/package-info.java index 13498a10405..291e60cd454 100644 --- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/package-info.java +++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/package-info.java @@ -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;