From 1f0ed60ba0d9e8c691588cd4c285966d28b614c9 Mon Sep 17 00:00:00 2001
From: Romain Manni-Bucau <rmannibucau@gmail.com>
Date: Wed, 24 Aug 2022 08:53:23 +0200
Subject: [PATCH] [MNG-7532] Log shouldn't have been deprecated so ensure it is
 not

---
 .../src/main/java/org/apache/maven/plugin/AbstractMojo.java | 6 ------
 .../src/main/java/org/apache/maven/plugin/Mojo.java         | 4 ----
 .../src/main/java/org/apache/maven/plugin/logging/Log.java  | 2 --
 .../org/apache/maven/plugin/logging/SystemStreamLog.java    | 2 --
 4 files changed, 14 deletions(-)

diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
index 4042f84dea62..6a74a64eb65e 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
@@ -149,10 +149,6 @@ public abstract class AbstractMojo
     /** Plugin container context */
     private Map pluginContext;
 
-    /**
-     * @deprecated Use SLF4J directly
-     */
-    @Deprecated
     @Override
     public void setLog( Log log )
     {
@@ -171,9 +167,7 @@ public void setLog( Log log )
      * method directly whenever you need the logger, it is fast enough and needs no caching.
      *
      * @see org.apache.maven.plugin.Mojo#getLog()
-     * @deprecated Use SLF4J directly
      */
-    @Deprecated
     @Override
     public Log getLog()
     {
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java
index 0419176057a9..aa277f933ed7 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java
@@ -55,9 +55,7 @@ void execute()
      *
      * @param log a new logger
      *
-     * @deprecated Use SLF4J directly
      */
-    @Deprecated
     void setLog( Log log );
 
     /**
@@ -65,8 +63,6 @@ void execute()
      *
      * @return a log4j-like logger object which allows plugins to create messages at levels of <code>"debug"</code>,
      * <code>"info"</code>, <code>"warn"</code>, and <code>"error"</code>.
-     * @deprecated Use SLF4J directly
      */
-    @Deprecated
     Log getLog();
 }
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java
index 04d85bd960cc..a2cf2a05b7cf 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/Log.java
@@ -29,9 +29,7 @@
  *
  * @author jdcasey
  *
- * @deprecated Use SLF4J directly
  */
-@Deprecated
 public interface Log
 {
     /**
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java
index f0fc6189d57f..885eead00289 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/logging/SystemStreamLog.java
@@ -27,9 +27,7 @@
  *
  * @author jdcasey
  *
- * @deprecated Use SLF4J directly
  */
-@Deprecated
 public class SystemStreamLog
     implements Log
 {