From 01144cc86ff4ab199ae4780067ac46dc5eec769d Mon Sep 17 00:00:00 2001 From: singingbush Date: Fri, 1 Sep 2023 00:25:12 +0100 Subject: [PATCH 1/4] mark loggers for Avalon and Lumberjack as deprecated --- .../java/org/apache/commons/logging/impl/AvalonLogger.java | 3 +++ .../org/apache/commons/logging/impl/Jdk13LumberjackLogger.java | 2 ++ .../java/org/apache/commons/logging/impl/LogKitLogger.java | 3 +++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java index 00e49f5..7eb167e 100644 --- a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java @@ -48,7 +48,10 @@ import org.apache.commons.logging.Log; * commons-logging, but this never actually worked (a NullPointerException would * be thrown as soon as the deserialized object was used), so removing this marker * is not considered to be an incompatible change. + * + * @deprecated Due to be removed as the Apache Avalon Project no longer exists */ +@Deprecated public class AvalonLogger implements Log { /** Ancestral Avalon logger. */ diff --git a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java index 3da9011..0b0daf8 100644 --- a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java @@ -33,7 +33,9 @@ import org.apache.commons.logging.Log; * available in SourceForge's Lumberjack for JDKs prior to 1.4. * * @since 1.1 + * @deprecated Due to be removed as Lumberjack is no longer maintained */ +@Deprecated public class Jdk13LumberjackLogger implements Log, Serializable { /** Serializable version identifier. */ diff --git a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java index 5216f4c..1cc44ee 100644 --- a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java @@ -30,7 +30,10 @@ import org.apache.commons.logging.Log; * {@code LogKit} accepts only {@code String} messages. * Therefore, this implementation converts object messages into strings * by called their {@code toString()} method before logging them. + * + * @deprecated Due to be removed as the Apache Avalon Project no longer exists */ +@Deprecated public class LogKitLogger implements Log, Serializable { /** Serializable version identifier. */ From 529a0a9cea832435a7d92e65744eaab879bc618a Mon Sep 17 00:00:00 2001 From: Christian Grobmeier Date: Mon, 9 Oct 2023 23:00:10 +0200 Subject: [PATCH 2/4] improved wording --- src/main/java/org/apache/commons/logging/impl/AvalonLogger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java index 7eb167e..fc51fd6 100644 --- a/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/AvalonLogger.java @@ -49,7 +49,7 @@ import org.apache.commons.logging.Log; * be thrown as soon as the deserialized object was used), so removing this marker * is not considered to be an incompatible change. * - * @deprecated Due to be removed as the Apache Avalon Project no longer exists + * @deprecated Scheduled for removal because the Apache Avalon Project has been discontinued. */ @Deprecated public class AvalonLogger implements Log { From b846931a1195e464f50b2cd373a7b56b231021da Mon Sep 17 00:00:00 2001 From: Christian Grobmeier Date: Mon, 9 Oct 2023 23:00:35 +0200 Subject: [PATCH 3/4] improved wording --- .../org/apache/commons/logging/impl/Jdk13LumberjackLogger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java index 0b0daf8..fcb0a93 100644 --- a/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/Jdk13LumberjackLogger.java @@ -33,7 +33,7 @@ import org.apache.commons.logging.Log; * available in SourceForge's Lumberjack for JDKs prior to 1.4. * * @since 1.1 - * @deprecated Due to be removed as Lumberjack is no longer maintained + * @deprecated Scheduled for removal because the Apache Avalon Project has been discontinued. */ @Deprecated public class Jdk13LumberjackLogger implements Log, Serializable { From a115c97bdd40b558dec358ea0bfa3043cb799ab6 Mon Sep 17 00:00:00 2001 From: Christian Grobmeier Date: Mon, 9 Oct 2023 23:01:01 +0200 Subject: [PATCH 4/4] improved wording --- src/main/java/org/apache/commons/logging/impl/LogKitLogger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java index 1cc44ee..05bf08f 100644 --- a/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java +++ b/src/main/java/org/apache/commons/logging/impl/LogKitLogger.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; * Therefore, this implementation converts object messages into strings * by called their {@code toString()} method before logging them. * - * @deprecated Due to be removed as the Apache Avalon Project no longer exists + * @deprecated Scheduled for removal because the Apache Avalon Project has been discontinued. */ @Deprecated public class LogKitLogger implements Log, Serializable {