This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch MRESOLVER-170 in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit db800dcf9b3b6a640dcd71872e275a16d3e6fb26 Author: Michael Osipov <micha...@apache.org> AuthorDate: Sun Apr 25 19:38:09 2021 +0200 [MRESOLVER-170] Deprecate org.eclipse.aether.spi.log --- .../internal/impl/slf4j/Slf4jLoggerFactory.java | 7 +++++-- .../main/java/org/eclipse/aether/spi/log/Logger.java | 19 +++++++++++-------- .../org/eclipse/aether/spi/log/LoggerFactory.java | 9 ++++++--- .../java/org/eclipse/aether/spi/log/NullLogger.java | 7 +++++-- .../org/eclipse/aether/spi/log/NullLoggerFactory.java | 9 ++++++--- .../aether/internal/test/util/TestLoggerFactory.java | 7 +++++-- 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java index d9ffccc..d9a6346 100644 --- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java +++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java @@ -8,9 +8,9 @@ package org.eclipse.aether.internal.impl.slf4j; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -33,9 +33,12 @@ import org.slf4j.spi.LocationAwareLogger; /** * A logger factory that delegates to <a href="http://www.slf4j.org/" target="_blank">SLF4J</a> logging. + * + * @deprecated Use SLF4J instead */ @Singleton @Named( "slf4j" ) +@Deprecated public class Slf4jLoggerFactory implements LoggerFactory, Service { diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java index 8b4bfb3..dbe6778 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java +++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java @@ -8,9 +8,9 @@ package org.eclipse.aether.spi.log; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,27 +23,30 @@ package org.eclipse.aether.spi.log; * A simple logger to facilitate emission of diagnostic messages. In general, unrecoverable errors should be reported * via exceptions and informational notifications should be reported via events, hence this logger interface focuses on * support for tracing. + * + * @deprecated Use SLF4J instead */ +@Deprecated public interface Logger { /** * Indicates whether debug logging is enabled. - * + * * @return {@code true} if debug logging is enabled, {@code false} otherwise. */ boolean isDebugEnabled(); /** * Emits the specified message. - * + * * @param msg The message to log, must not be {@code null}. */ void debug( String msg ); /** * Emits the specified message along with a stack trace of the given exception. - * + * * @param msg The message to log, must not be {@code null}. * @param error The exception to log, may be {@code null}. */ @@ -51,21 +54,21 @@ public interface Logger /** * Indicates whether warn logging is enabled. - * + * * @return {@code true} if warn logging is enabled, {@code false} otherwise. */ boolean isWarnEnabled(); /** * Emits the specified message. - * + * * @param msg The message to log, must not be {@code null}. */ void warn( String msg ); /** * Emits the specified message along with a stack trace of the given exception. - * + * * @param msg The message to log, must not be {@code null}. * @param error The exception to log, may be {@code null}. */ diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java index 9f66eb1..3258e04 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java +++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java @@ -8,9 +8,9 @@ package org.eclipse.aether.spi.log; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,13 +21,16 @@ package org.eclipse.aether.spi.log; /** * A factory to create loggers. + * + * @deprecated Use SLF4J instead */ +@Deprecated public interface LoggerFactory { /** * Gets a logger for a class with the specified name. - * + * * @param name The name of the class requesting a logger, must not be {@code null}. * @return The requested logger, never {@code null}. */ diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java index 8fb7745..c1bacba 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java +++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java @@ -8,9 +8,9 @@ package org.eclipse.aether.spi.log; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,7 +21,10 @@ package org.eclipse.aether.spi.log; /** * A logger that disables any logging. + * + * @deprecated Use SLF4J instead */ +@Deprecated final class NullLogger implements Logger { diff --git a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java index bea659f..8bf8a24 100644 --- a/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java +++ b/maven-resolver-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java @@ -8,9 +8,9 @@ package org.eclipse.aether.spi.log; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,7 +21,10 @@ package org.eclipse.aether.spi.log; /** * A logger factory that disables any logging. + * + * @deprecated Use SLF4J instead */ +@Deprecated public final class NullLoggerFactory implements LoggerFactory { @@ -49,7 +52,7 @@ public final class NullLoggerFactory /** * Gets a logger from the specified factory for the given class, falling back to a logger from this factory if the * specified factory is {@code null} or fails to provide a logger. - * + * * @param loggerFactory The logger factory from which to get the logger, may be {@code null}. * @param type The class for which to get the logger, must not be {@code null}. * @return The requested logger, never {@code null}. diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java index b1f7457..ae58a16 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java +++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java @@ -8,9 +8,9 @@ package org.eclipse.aether.internal.test.util; * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -26,7 +26,10 @@ import org.eclipse.aether.spi.log.LoggerFactory; /** * A logger factory that writes to some {@link PrintStream}. + * + * @deprecated Use SLF4J instead */ +@Deprecated public final class TestLoggerFactory implements LoggerFactory {