This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push: new 87670dd [MNG-6931] Deprecate custom logging approach 87670dd is described below commit 87670ddc08cc2512e70b063b686ae1be03f72728 Author: Michael Osipov <micha...@apache.org> AuthorDate: Sun Oct 18 20:06:04 2020 +0200 [MNG-6931] Deprecate custom logging approach This closes #385 --- .../main/java/org/apache/maven/monitor/logging/DefaultLog.java | 5 ++++- .../src/main/java/org/apache/maven/plugin/AbstractMojo.java | 10 ++++++++-- .../src/main/java/org/apache/maven/plugin/Mojo.java | 9 ++++++--- .../src/main/java/org/apache/maven/plugin/logging/Log.java | 5 ++++- .../java/org/apache/maven/plugin/logging/SystemStreamLog.java | 5 ++++- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java b/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java index 4fee2e2..1ed64ec 100644 --- a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java +++ b/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java @@ -24,7 +24,10 @@ import org.codehaus.plexus.logging.Logger; /** * @author jdcasey + * + * @deprecated Use SLF4J directly */ +@Deprecated public class DefaultLog implements Log { @@ -128,4 +131,4 @@ public class DefaultLog return logger.isErrorEnabled(); } -} \ No newline at end of file +} 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 1a78549..4042f84 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 @@ -128,9 +128,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog; * </td> * </tr> * </table> - * <p>This is only a small set of all the options. A complete list can be found at + * <p>This is only a small set of all the options. A complete list can be found at * <a href="https://maven.apache.org/components/plugin-tools/maven-plugin-tools-annotations/index.html" target="_blank"> - * Maven Plugin Tool for Annotations</a>. + * Maven Plugin Tool for Annotations</a>. * * @see <a href="https://maven.apache.org/guides/plugin/guide-java-plugin-development.html" target="_blank">Guide to Developing Java Plugins</a> * @see <a href="https://maven.apache.org/guides/mini/guide-configuring-plugins.html" target="_blank">Guide to Configuring Plug-ins</a> @@ -149,6 +149,10 @@ public abstract class AbstractMojo /** Plugin container context */ private Map pluginContext; + /** + * @deprecated Use SLF4J directly + */ + @Deprecated @Override public void setLog( Log log ) { @@ -167,7 +171,9 @@ public abstract class AbstractMojo * 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 7cbef91..0419176 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 @@ -54,16 +54,19 @@ public interface Mojo * and feedback to the user. * * @param log a new logger + * + * @deprecated Use SLF4J directly */ - // TODO not sure about this here, and may want a getLog on here as well/instead + @Deprecated void setLog( Log log ); /** * Furnish access to the standard Maven logging mechanism which is managed in this base class. * * @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>. This logger is the accepted means to display - * information to the user. + * <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 0a13bef..04d85bd 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 @@ -28,7 +28,10 @@ package org.apache.maven.plugin.logging; * rather than formatting first by calling <code>toString()</code>. * * @author jdcasey + * + * @deprecated Use SLF4J directly */ +@Deprecated public interface Log { /** @@ -146,4 +149,4 @@ public interface Log * @param error */ void error( Throwable error ); -} \ No newline at end of file +} 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 38c1316..ead489a 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 @@ -26,7 +26,10 @@ import java.io.StringWriter; * Logger with "standard" output and error output stream. * * @author jdcasey + * + * @deprecated Use SLF4J directly */ +@Deprecated public class SystemStreamLog implements Log { @@ -193,4 +196,4 @@ public class SystemStreamLog System.out.println( "[" + prefix + "] " + content.toString() + "\n\n" + sWriter.toString() ); } -} \ No newline at end of file +}