diff --git a/httpclient5-cache/pom.xml b/httpclient5-cache/pom.xml index cc73ab0e9..dd45b7176 100644 --- a/httpclient5-cache/pom.xml +++ b/httpclient5-cache/pom.xml @@ -45,14 +45,18 @@ compile - org.apache.logging.log4j - log4j-api + org.slf4j + slf4j-api compile + + org.apache.logging.log4j + log4j-slf4j-impl + test + org.apache.logging.log4j log4j-core - ${log4j.version} test diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java index 7b38fa092..c2edfdf09 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java @@ -50,12 +50,12 @@ import org.apache.hc.core5.http.message.RequestLine; import org.apache.hc.core5.http.message.StatusLine; import org.apache.hc.core5.util.ByteArrayBuffer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class BasicHttpAsyncCache implements HttpAsyncCache { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final CacheUpdateHandler cacheUpdateHandler; private final CacheKeyGenerator cacheKeyGenerator; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java index 248cbccfc..ba2780888 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java @@ -46,12 +46,12 @@ import org.apache.hc.core5.http.message.RequestLine; import org.apache.hc.core5.http.message.StatusLine; import org.apache.hc.core5.util.ByteArrayBuffer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class BasicHttpCache implements HttpCache { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final CacheUpdateHandler cacheUpdateHandler; private final CacheKeyGenerator cacheKeyGenerator; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java index be9d3af9f..9813871d1 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheRevalidatorBase.java @@ -45,8 +45,8 @@ import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract cache re-validation class. @@ -94,7 +94,7 @@ public void awaitTermination(final Timeout timeout) throws InterruptedException private final Set pendingRequest; private final ConcurrentCountMap failureCache; - final Logger log = LogManager.getLogger(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); /** * Create CacheValidator which will make ache revalidation requests diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java index d2278af3c..620ad9b26 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java @@ -36,8 +36,8 @@ import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; import org.apache.hc.core5.http.message.MessageSupport; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Determines if an HttpRequest is allowed to be served from the cache. @@ -47,7 +47,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) class CacheableRequestPolicy { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); /** * Determines if an HttpRequest can be served from the cache. diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java index c7160fb7d..f191778cb 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachedResponseSuitabilityChecker.java @@ -40,8 +40,8 @@ import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.message.MessageSupport; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Determines whether a given {@link HttpCacheEntry} is suitable to be @@ -52,7 +52,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) class CachedResponseSuitabilityChecker { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final boolean sharedCache; private final boolean useHeuristicCaching; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java index a01e696c9..66796b47c 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java @@ -69,8 +69,8 @@ import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.ByteArrayBuffer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -107,7 +107,7 @@ public class CachingExec extends CachingExecBase implements ExecChainHandler { private final DefaultCacheRevalidator cacheRevalidator; private final ConditionalRequestBuilder conditionalRequestBuilder; - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); CachingExec(final HttpCache cache, final DefaultCacheRevalidator cacheRevalidator, final CacheConfig config) { super(config); diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java index 63c1739f0..9fd6f56ff 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java @@ -54,8 +54,8 @@ import org.apache.hc.core5.http.message.MessageSupport; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.VersionInfo; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CachingExecBase { @@ -76,7 +76,7 @@ public class CachingExecBase { final RequestProtocolCompliance requestCompliance; final CacheConfig cacheConfig; - final Logger log = LogManager.getLogger(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); CachingExecBase( final CacheValidityPolicy validityPolicy, diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java index c9f7b22cf..6043a543a 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java @@ -47,8 +47,8 @@ import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpStatus; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Given a particular HTTP request / response pair, flush any cache entries @@ -62,7 +62,7 @@ public class DefaultAsyncCacheInvalidator extends CacheInvalidatorBase implement public static final DefaultAsyncCacheInvalidator INSTANCE = new DefaultAsyncCacheInvalidator(); - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private void removeEntry(final HttpAsyncCacheStorage storage, final String cacheKey) { storage.removeEntry(cacheKey, new FutureCallback() { diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java index 2297e6ff9..731308066 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java @@ -41,8 +41,8 @@ import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Given a particular HTTP request / response pair, flush any cache entries @@ -56,7 +56,7 @@ public class DefaultCacheInvalidator extends CacheInvalidatorBase implements Htt public static final DefaultCacheInvalidator INSTANCE = new DefaultCacheInvalidator(); - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private HttpCacheEntry getEntry(final HttpCacheStorage storage, final String cacheKey) { try { diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java index 4078c1ab7..e8622747e 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/ResponseCachingPolicy.java @@ -46,8 +46,8 @@ import org.apache.hc.core5.http.HttpVersion; import org.apache.hc.core5.http.ProtocolVersion; import org.apache.hc.core5.http.message.MessageSupport; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Determines if an HttpResponse can be cached. @@ -68,7 +68,7 @@ class ResponseCachingPolicy { HttpStatus.SC_MOVED_PERMANENTLY, HttpStatus.SC_GONE)); - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final long maxObjectSizeBytes; private final boolean sharedCache; diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java index 9b1c13f11..dd23b3c42 100644 --- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java +++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/memcached/SHA256KeyHashingScheme.java @@ -30,8 +30,8 @@ import java.security.NoSuchAlgorithmException; import org.apache.commons.codec.binary.Hex; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is a {@link KeyHashingScheme} based on the @@ -44,7 +44,7 @@ public final class SHA256KeyHashingScheme implements KeyHashingScheme { public static final SHA256KeyHashingScheme INSTANCE = new SHA256KeyHashingScheme(); - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); @Override public String hash(final String key) { diff --git a/httpclient5-fluent/pom.xml b/httpclient5-fluent/pom.xml index 40253e125..6510e7b37 100644 --- a/httpclient5-fluent/pom.xml +++ b/httpclient5-fluent/pom.xml @@ -51,15 +51,19 @@ test tests - + + org.slf4j + slf4j-api + compile + org.apache.logging.log4j - log4j-api + log4j-slf4j-impl + test org.apache.logging.log4j log4j-core - ${log4j.version} test diff --git a/httpclient5-osgi/pom.xml b/httpclient5-osgi/pom.xml index dc2900509..bc5c72f90 100644 --- a/httpclient5-osgi/pom.xml +++ b/httpclient5-osgi/pom.xml @@ -40,8 +40,8 @@ bundle - "5.0-alpha2" - "2.8" + "5.0-beta1" + "[1.7, 1.8)" 5.0.0 @@ -57,12 +57,6 @@ httpcore5-osgi ${httpcore.version} provided - - - org.apache.httpcomponents.client5 - httpcore-nio - - commons-codec @@ -134,7 +128,7 @@ org.ietf.jgss,, org.osgi.framework, org.osgi.service.cm, - org.apache.logging.log4j;version=${log4j.osgi.import.version}, + org.slf4j;version=${slf4j.osgi.import.version}, org.apache.hc.core5.*;version=${httpcore.osgi.import.version}, org.ehcache.*;resolution:=optional, net.spy.memcached.*;resolution:=optional diff --git a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java index dc9fc277b..d49a7c45f 100644 --- a/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java +++ b/httpclient5-osgi/src/main/java/org/apache/hc/client5/http/osgi/impl/OSGiCredentialsProvider.java @@ -35,15 +35,15 @@ import org.apache.hc.client5.http.auth.UsernamePasswordCredentials; import org.apache.hc.client5.http.osgi.services.ProxyConfiguration; import org.apache.hc.core5.http.protocol.HttpContext; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @since 4.3 */ final class OSGiCredentialsProvider implements CredentialsStore { - private static final Logger log = LogManager.getLogger(OSGiCredentialsProvider.class); + private static final Logger log = LoggerFactory.getLogger(OSGiCredentialsProvider.class); private static final int HOST_AND_PORT_MATCH = 12; diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml index 3693fc3a1..35212ec6b 100644 --- a/httpclient5-testing/pom.xml +++ b/httpclient5-testing/pom.xml @@ -48,6 +48,18 @@ ${project.version} compile + + org.slf4j + slf4j-api + compile + + + org.apache.logging.log4j + log4j-slf4j-impl + compile + true + + org.apache.logging.log4j log4j-api @@ -57,6 +69,7 @@ org.apache.logging.log4j log4j-core compile + true org.apache.httpcomponents.client5 diff --git a/httpclient5-win/pom.xml b/httpclient5-win/pom.xml index e4a9fc130..0cb290e46 100644 --- a/httpclient5-win/pom.xml +++ b/httpclient5-win/pom.xml @@ -50,6 +50,21 @@ test tests + + org.slf4j + slf4j-api + compile + + + org.apache.logging.log4j + log4j-slf4j-impl + test + + + org.apache.logging.log4j + log4j-core + test + net.java.dev.jna jna @@ -65,11 +80,6 @@ junit test - - org.apache.logging.log4j - log4j-core - test - diff --git a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java index 90dc90607..e7d2b91ff 100644 --- a/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java +++ b/httpclient5-win/src/main/java/org/apache/hc/client5/http/impl/win/WindowsNegotiateScheme.java @@ -44,8 +44,8 @@ import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.sun.jna.platform.win32.Secur32; import com.sun.jna.platform.win32.Secur32Util; @@ -71,7 +71,7 @@ */ public class WindowsNegotiateScheme implements AuthScheme { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); // NTLM or Negotiate private final String scheme; diff --git a/httpclient5/pom.xml b/httpclient5/pom.xml index 9361eb912..f7e6d0bd1 100644 --- a/httpclient5/pom.xml +++ b/httpclient5/pom.xml @@ -48,14 +48,18 @@ compile - org.apache.logging.log4j - log4j-api + org.slf4j + slf4j-api compile + + org.apache.logging.log4j + log4j-slf4j-impl + test + org.apache.logging.log4j log4j-core - ${log4j.version} test diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java index 89233614f..bfcf98ffe 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java @@ -48,8 +48,8 @@ import org.apache.hc.core5.http.config.Lookup; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default implementation of {@link AuthenticationStrategy} @@ -59,7 +59,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) public class DefaultAuthenticationStrategy implements AuthenticationStrategy { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); public static final DefaultAuthenticationStrategy INSTANCE = new DefaultAuthenticationStrategy(); diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java index 7c28c2bf6..f915b8c8b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/InMemoryDnsResolver.java @@ -34,8 +34,8 @@ import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * In-memory {@link DnsResolver} implementation. @@ -45,7 +45,7 @@ public class InMemoryDnsResolver implements DnsResolver { /** Logger associated to this class. */ - private final Logger log = LogManager.getLogger(InMemoryDnsResolver.class); + private final Logger log = LoggerFactory.getLogger(InMemoryDnsResolver.class); /** * In-memory collection that will hold the associations between a host name diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java index fd48ebd1f..e7db3feca 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/Wire.java @@ -31,7 +31,7 @@ import org.apache.hc.core5.annotation.Internal; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; @Internal public class Wire { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java index 11ccf4aaf..8cf07932b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AbstractHttpAsyncClientBase.java @@ -40,14 +40,14 @@ import org.apache.hc.core5.reactor.ExceptionEvent; import org.apache.hc.core5.reactor.IOReactorStatus; import org.apache.hc.core5.util.TimeValue; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; abstract class AbstractHttpAsyncClientBase extends CloseableHttpAsyncClient { enum Status { READY, RUNNING, TERMINATED } - final Logger log = LogManager.getLogger(getClass()); + final Logger log = LoggerFactory.getLogger(getClass()); private final AsyncPushConsumerRegistry pushConsumerRegistry; private final DefaultConnectingIOReactor ioReactor; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java index 378b44e9c..e5a8e628e 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncConnectExec.java @@ -63,8 +63,8 @@ import org.apache.hc.core5.http.protocol.HttpCoreContext; import org.apache.hc.core5.http.protocol.HttpProcessor; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request executor in the HTTP request execution chain @@ -76,7 +76,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public final class AsyncConnectExec implements AsyncExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpProcessor proxyHttpProcessor; private final AuthenticationStrategy proxyAuthStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java index 6d524fea9..4b3f7b678 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncProtocolExec.java @@ -64,8 +64,8 @@ import org.apache.hc.core5.http.protocol.HttpProcessor; import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request executor in the request execution chain that is responsible @@ -80,7 +80,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) class AsyncProtocolExec implements AsyncExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpProcessor httpProcessor; private final AuthenticationStrategy targetAuthStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java index cdd86b5ca..397581374 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRedirectExec.java @@ -55,12 +55,12 @@ import org.apache.hc.core5.http.nio.AsyncDataConsumer; import org.apache.hc.core5.http.nio.AsyncEntityProducer; import org.apache.hc.core5.util.LangUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class AsyncRedirectExec implements AsyncExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpRoutePlanner routePlanner; private final RedirectStrategy redirectStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java index 309d44b8c..1118ed3ab 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/AsyncRetryExec.java @@ -42,12 +42,12 @@ import org.apache.hc.core5.http.nio.AsyncDataConsumer; import org.apache.hc.core5.http.nio.AsyncEntityProducer; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class AsyncRetryExec implements AsyncExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpRequestRetryHandler retryHandler; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java index 564a561cd..9c5cd87d2 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncClientEventHandlerFactory.java @@ -48,8 +48,8 @@ import org.apache.hc.core5.reactor.IOEventHandlerFactory; import org.apache.hc.core5.reactor.TlsCapableIOSession; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @since 5.0 @@ -57,11 +57,11 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) class Http2AsyncClientEventHandlerFactory implements IOEventHandlerFactory { - private final Logger wireLog = LogManager.getLogger("org.apache.hc.client5.http.wire"); - private final Logger headerLog = LogManager.getLogger("org.apache.hc.client5.http.headers"); - private final Logger frameLog = LogManager.getLogger("org.apache.hc.client5.http2.frame"); - private final Logger framePayloadLog = LogManager.getLogger("org.apache.hc.client5.http2.frame.payload"); - private final Logger flowCtrlLog = LogManager.getLogger("org.apache.hc.client5.http2.flow"); + private final Logger wireLog = LoggerFactory.getLogger("org.apache.hc.client5.http.wire"); + private final Logger headerLog = LoggerFactory.getLogger("org.apache.hc.client5.http.headers"); + private final Logger frameLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame"); + private final Logger framePayloadLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame.payload"); + private final Logger flowCtrlLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.flow"); private final HttpProcessor httpProcessor; private final HandlerFactory exchangeHandlerFactory; @@ -81,7 +81,7 @@ class Http2AsyncClientEventHandlerFactory implements IOEventHandlerFactory { @Override public IOEventHandler createHandler(final TlsCapableIOSession ioSession, final Object attachment) { - final Logger sessionLog = LogManager.getLogger(ioSession.getClass()); + final Logger sessionLog = LoggerFactory.getLogger(ioSession.getClass()); if (sessionLog.isDebugEnabled() || wireLog.isDebugEnabled() || headerLog.isDebugEnabled() diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java index a954a568a..18c6892cc 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/Http2AsyncMainClientExec.java @@ -50,12 +50,12 @@ import org.apache.hc.core5.http.nio.CapacityChannel; import org.apache.hc.core5.http.nio.DataStreamChannel; import org.apache.hc.core5.http.nio.RequestChannel; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class Http2AsyncMainClientExec implements AsyncExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); @Override public void execute( diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java index 4a97d67b1..71f3a805b 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncClientEventHandlerFactory.java @@ -64,8 +64,8 @@ import org.apache.hc.core5.reactor.IOEventHandlerFactory; import org.apache.hc.core5.reactor.TlsCapableIOSession; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @since 5.0 @@ -73,12 +73,12 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) class HttpAsyncClientEventHandlerFactory implements IOEventHandlerFactory { - private final Logger streamLog = LogManager.getLogger(InternalHttpAsyncClient.class); - private final Logger wireLog = LogManager.getLogger("org.apache.hc.client5.http.wire"); - private final Logger headerLog = LogManager.getLogger("org.apache.hc.client5.http.headers"); - private final Logger frameLog = LogManager.getLogger("org.apache.hc.client5.http2.frame"); - private final Logger framePayloadLog = LogManager.getLogger("org.apache.hc.client5.http2.frame.payload"); - private final Logger flowCtrlLog = LogManager.getLogger("org.apache.hc.client5.http2.flow"); + private final Logger streamLog = LoggerFactory.getLogger(InternalHttpAsyncClient.class); + private final Logger wireLog = LoggerFactory.getLogger("org.apache.hc.client5.http.wire"); + private final Logger headerLog = LoggerFactory.getLogger("org.apache.hc.client5.http.headers"); + private final Logger frameLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame"); + private final Logger framePayloadLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.frame.payload"); + private final Logger flowCtrlLog = LoggerFactory.getLogger("org.apache.hc.client5.http2.flow"); private final HttpProcessor httpProcessor; private final HandlerFactory exchangeHandlerFactory; @@ -111,7 +111,7 @@ class HttpAsyncClientEventHandlerFactory implements IOEventHandlerFactory { @Override public IOEventHandler createHandler(final TlsCapableIOSession ioSession, final Object attachment) { - final Logger sessionLog = LogManager.getLogger(ioSession.getClass()); + final Logger sessionLog = LoggerFactory.getLogger(ioSession.getClass()); if (sessionLog.isDebugEnabled() || streamLog.isDebugEnabled() || wireLog.isDebugEnabled() diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java index 012803c62..301382c2f 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/HttpAsyncMainClientExec.java @@ -55,12 +55,12 @@ import org.apache.hc.core5.http.nio.DataStreamChannel; import org.apache.hc.core5.http.nio.RequestChannel; import org.apache.hc.core5.util.TimeValue; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; class HttpAsyncMainClientExec implements AsyncExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final ConnectionKeepAliveStrategy keepAliveStrategy; private final UserTokenHandler userTokenHandler; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java index 4c93f852e..be8ef7cfe 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttp2AsyncExecRuntime.java @@ -45,7 +45,7 @@ import org.apache.hc.core5.io.ShutdownType; import org.apache.hc.core5.reactor.IOSession; import org.apache.hc.core5.util.TimeValue; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; class InternalHttp2AsyncExecRuntime implements AsyncExecRuntime { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java index 761662d71..dc91be1cc 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/InternalHttpAsyncExecRuntime.java @@ -45,7 +45,7 @@ import org.apache.hc.core5.http2.HttpVersionPolicy; import org.apache.hc.core5.reactor.ConnectionInitiator; import org.apache.hc.core5.util.TimeValue; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; class InternalHttpAsyncExecRuntime implements AsyncExecRuntime { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java index 5d5070d08..1a328a6aa 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LogAppendable.java @@ -29,7 +29,7 @@ import java.io.IOException; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; public final class LogAppendable implements Appendable { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java index 1adb8242a..b605da417 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingAsyncClientExchangeHandler.java @@ -42,7 +42,7 @@ import org.apache.hc.core5.http.nio.DataStreamChannel; import org.apache.hc.core5.http.nio.RequestChannel; import org.apache.hc.core5.util.Identifiable; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; final class LoggingAsyncClientExchangeHandler implements AsyncClientExchangeHandler, Identifiable { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java index c8f27c1a2..b9f4ede62 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/async/LoggingIOSession.java @@ -44,7 +44,7 @@ import org.apache.hc.core5.reactor.ssl.SSLSessionInitializer; import org.apache.hc.core5.reactor.ssl.SSLSessionVerifier; import org.apache.hc.core5.reactor.ssl.TlsDetails; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; class LoggingIOSession implements TlsCapableIOSession { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java index d9b29809c..33f886c3f 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/BasicAuthCache.java @@ -44,8 +44,8 @@ import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default implementation of {@link AuthCache}. This implements @@ -60,7 +60,7 @@ @Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class BasicAuthCache implements AuthCache { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final Map map; private final SchemePortResolver schemePortResolver; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java index 040bcdda2..62484ae87 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/CredSspScheme.java @@ -60,8 +60,8 @@ import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** *

@@ -83,7 +83,7 @@ public class CredSspScheme implements AuthScheme private static final Charset UNICODE_LITTLE_UNMARKED = Charset.forName( "UnicodeLittleUnmarked" ); public static final String SCHEME_NAME = "CredSSP"; - private final Logger log = LogManager.getLogger( CredSspScheme.class ); + private final Logger log = LoggerFactory.getLogger( CredSspScheme.class ); enum State { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java index 1453a214c..9afa26d76 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/GGSSchemeBase.java @@ -47,14 +47,14 @@ import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.ietf.jgss.GSSName; import org.ietf.jgss.Oid; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @since 4.2 @@ -68,7 +68,7 @@ enum State { FAILED, } - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final KerberosConfig config; private final DnsResolver dnsResolver; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java index 3f651c5e5..20b480cc7 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/auth/HttpAuthenticator.java @@ -58,8 +58,8 @@ import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Asserts; import org.apache.hc.core5.util.CharArrayBuffer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @since 4.3 @@ -71,7 +71,7 @@ public class HttpAuthenticator { public HttpAuthenticator(final Logger log) { super(); - this.log = log != null ? log : LogManager.getLogger(getClass()); + this.log = log != null ? log : LoggerFactory.getLogger(getClass()); this.parser = new AuthChallengeParser(); } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java index 28fa83320..de105cab8 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/CloseableHttpClient.java @@ -45,8 +45,8 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base implementation of {@link HttpClient} that also implements {@link Closeable}. @@ -56,7 +56,7 @@ @Contract(threading = ThreadingBehavior.SAFE) public abstract class CloseableHttpClient implements HttpClient, Closeable { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); protected abstract CloseableHttpResponse doExecute(HttpHost target, ClassicHttpRequest request, HttpContext context) throws IOException; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java index 1fb5900fd..aa31790dd 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ConnectExec.java @@ -60,8 +60,8 @@ import org.apache.hc.core5.http.message.StatusLine; import org.apache.hc.core5.http.protocol.HttpProcessor; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request executor in the HTTP request execution chain @@ -73,7 +73,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) public final class ConnectExec implements ExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final ConnectionReuseStrategy reuseStrategy; private final HttpProcessor proxyHttpProcessor; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java index 40b4d20e6..6398957c7 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalExecRuntime.java @@ -50,7 +50,7 @@ import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; class InternalExecRuntime implements ExecRuntime, Cancellable { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java index e4fd36ae0..e915677fe 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/InternalHttpClient.java @@ -60,8 +60,8 @@ import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Internal class. @@ -71,7 +71,7 @@ @Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) class InternalHttpClient extends CloseableHttpClient implements Configurable { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpClientConnectionManager connManager; private final HttpRequestExecutor requestExecutor; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java index 661139d3b..aa08ed7eb 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MainClientExec.java @@ -48,8 +48,8 @@ import org.apache.hc.core5.http.message.RequestLine; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TimeValue; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The last request executor in the HTTP request execution chain @@ -61,7 +61,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) final class MainClientExec implements ExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final ConnectionReuseStrategy reuseStrategy; private final ConnectionKeepAliveStrategy keepAliveStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java index a34ea2725..2ecb520b7 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/MinimalHttpClient.java @@ -64,8 +64,8 @@ import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.VersionInfo; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Internal class. @@ -75,7 +75,7 @@ @Contract(threading = ThreadingBehavior.SAFE) public class MinimalHttpClient extends CloseableHttpClient { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpClientConnectionManager connManager; private final ConnectionReuseStrategy reuseStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java index 081622317..c311a8702 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ProtocolExec.java @@ -63,8 +63,8 @@ import org.apache.hc.core5.http.protocol.HttpProcessor; import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request executor in the request execution chain that is responsible @@ -80,7 +80,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) final class ProtocolExec implements ExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpProcessor httpProcessor; private final AuthenticationStrategy targetAuthStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java index 80e5cbfb5..6743afdfa 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RedirectExec.java @@ -58,8 +58,8 @@ import org.apache.hc.core5.http.io.entity.EntityUtils; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.LangUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request executor in the request execution chain that is responsible @@ -75,7 +75,7 @@ @Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) final class RedirectExec implements ExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final RedirectStrategy redirectStrategy; private final HttpRoutePlanner routePlanner; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java index 8e7c8a50e..1f1be4fa5 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/RetryExec.java @@ -42,8 +42,8 @@ import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.NoHttpResponseException; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request executor in the request execution chain that is responsible @@ -60,7 +60,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) final class RetryExec implements ExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpRequestRetryHandler retryHandler; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java index e36a02fce..285d4d872 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/ServiceUnavailableRetryExec.java @@ -41,8 +41,8 @@ import org.apache.hc.core5.http.HttpEntity; import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request executor in the request execution chain that is responsible @@ -59,7 +59,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE_CONDITIONAL) final class ServiceUnavailableRetryExec implements ExecChainHandler { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final ServiceUnavailableRetryStrategy retryStrategy; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java index f88431379..d6f1f6fc8 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/BasicHttpClientConnectionManager.java @@ -66,8 +66,8 @@ import org.apache.hc.core5.util.LangUtils; import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * A connection manager for a single connection. This connection manager maintains only one active @@ -90,7 +90,7 @@ @Contract(threading = ThreadingBehavior.SAFE) public class BasicHttpClientConnectionManager implements HttpClientConnectionManager { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final HttpClientConnectionOperator connectionOperator; private final HttpConnectionFactory connFactory; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java index 0a380184a..6b532b79c 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java @@ -56,8 +56,8 @@ import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TimeValue; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default implementation of {@link HttpClientConnectionOperator} used as default in Http client, @@ -72,7 +72,7 @@ public class DefaultHttpClientConnectionOperator implements HttpClientConnection static final String SOCKET_FACTORY_REGISTRY = "http.socket-factory-registry"; - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final Lookup socketFactoryRegistry; private final SchemePortResolver schemePortResolver; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java index 98e0e29d1..6e5d78cca 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java @@ -51,8 +51,8 @@ import org.apache.hc.core5.http.message.StatusLine; import org.apache.hc.core5.io.ShutdownType; import org.apache.hc.core5.util.Identifiable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default {@link ManagedHttpClientConnection} implementation. @@ -62,9 +62,9 @@ final class DefaultManagedHttpClientConnection extends DefaultBHttpClientConnection implements ManagedHttpClientConnection, Identifiable { - private final Logger log = LogManager.getLogger(DefaultManagedHttpClientConnection.class); - private final Logger headerlog = LogManager.getLogger("org.apache.hc.client5.http.headers"); - private final Logger wirelog = LogManager.getLogger("org.apache.hc.client5.http.wire"); + private final Logger log = LoggerFactory.getLogger(DefaultManagedHttpClientConnection.class); + private final Logger headerlog = LoggerFactory.getLogger("org.apache.hc.client5.http.headers"); + private final Logger wirelog = LoggerFactory.getLogger("org.apache.hc.client5.http.wire"); private final String id; private final AtomicBoolean closed; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java index b7b0e503e..4a0c246dd 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LenientHttpResponseParser.java @@ -36,8 +36,8 @@ import org.apache.hc.core5.http.impl.io.DefaultHttpResponseParser; import org.apache.hc.core5.http.message.LineParser; import org.apache.hc.core5.util.CharArrayBuffer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Lenient HTTP response parser implementation that can skip malformed data until @@ -47,7 +47,7 @@ */ public class LenientHttpResponseParser extends DefaultHttpResponseParser { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); /** * Creates new instance of DefaultHttpResponseParser. diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java index b7aae7646..5107b3316 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/LoggingSocketHolder.java @@ -34,7 +34,7 @@ import org.apache.hc.client5.http.impl.Wire; import org.apache.hc.core5.http.impl.io.SocketHolder; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; class LoggingSocketHolder extends SocketHolder { diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java index cb17912e5..d077deed6 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/io/PoolingHttpClientConnectionManager.java @@ -74,8 +74,8 @@ import org.apache.hc.core5.util.Asserts; import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@code ClientConnectionPoolManager} maintains a pool of @@ -105,7 +105,7 @@ public class PoolingHttpClientConnectionManager implements HttpClientConnectionManager, ConnPoolControl { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 25; public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 5; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java index 8a8a85ab6..29ff01e95 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/DefaultManagedAsyncClientConnection.java @@ -52,8 +52,8 @@ import org.apache.hc.core5.reactor.ssl.TlsDetails; import org.apache.hc.core5.reactor.ssl.TransportSecurityLayer; import org.apache.hc.core5.util.Identifiable; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default {@link ManagedAsyncClientConnection} implementation. @@ -63,7 +63,7 @@ @Internal final class DefaultManagedAsyncClientConnection implements ManagedAsyncClientConnection, Identifiable { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final IOSession ioSession; private final int socketTimeout; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java index 7973f6162..2550df9b4 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/nio/PoolingAsyncClientConnectionManager.java @@ -77,8 +77,8 @@ import org.apache.hc.core5.util.Identifiable; import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@code PoolingAsyncClientConnectionManager} maintains a pool of non-blocking @@ -101,7 +101,7 @@ @Contract(threading = ThreadingBehavior.SAFE_CONDITIONAL) public class PoolingAsyncClientConnectionManager implements AsyncClientConnectionManager, ConnPoolControl { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 25; public static final int DEFAULT_MAX_CONNECTIONS_PER_ROUTE = 5; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java index 857a4729a..d64a6c7d6 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAddCookies.java @@ -52,8 +52,8 @@ import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TextUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request interceptor that matches cookies available in the current @@ -65,7 +65,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) public class RequestAddCookies implements HttpRequestInterceptor { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); public RequestAddCookies() { super(); diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java index 6c3e9abf0..562bc2f61 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestAuthCache.java @@ -44,8 +44,8 @@ import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.net.URIAuthority; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Request interceptor that can preemptively authenticate against known hosts, @@ -57,7 +57,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) public class RequestAuthCache implements HttpRequestInterceptor { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); public RequestAuthCache() { super(); diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java index d027eb0ef..e1cebc16f 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/RequestClientConnControl.java @@ -40,8 +40,8 @@ import org.apache.hc.core5.http.HttpRequestInterceptor; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This protocol interceptor is responsible for adding {@code Connection} @@ -53,7 +53,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) public class RequestClientConnControl implements HttpRequestInterceptor { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private static final String PROXY_CONN_DIRECTIVE = "Proxy-Connection"; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java index 8ec84b81e..4dc563aa2 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/protocol/ResponseProcessCookies.java @@ -45,8 +45,8 @@ import org.apache.hc.core5.http.HttpResponseInterceptor; import org.apache.hc.core5.http.protocol.HttpContext; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Response interceptor that populates the current {@link CookieStore} with data @@ -57,7 +57,7 @@ @Contract(threading = ThreadingBehavior.IMMUTABLE) public class ResponseProcessCookies implements HttpResponseInterceptor { - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); public ResponseProcessCookies() { super(); diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java index af1adcb11..a03797137 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/psl/PublicSuffixMatcherLoader.java @@ -39,8 +39,8 @@ import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.util.Args; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * {@link PublicSuffixMatcher} loader. @@ -83,7 +83,7 @@ public static PublicSuffixMatcher getDefault() { DEFAULT_INSTANCE = load(url); } catch (final IOException ex) { // Should never happen - final Logger log = LogManager.getLogger(PublicSuffixMatcherLoader.class); + final Logger log = LoggerFactory.getLogger(PublicSuffixMatcherLoader.class); if (log.isWarnEnabled()) { log.warn("Failure loading public suffix list from default resource", ex); } diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java index 41c738379..6deb749a2 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/DefaultHostnameVerifier.java @@ -55,8 +55,8 @@ import org.apache.hc.core5.annotation.Contract; import org.apache.hc.core5.annotation.ThreadingBehavior; import org.apache.hc.core5.net.InetAddressUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default {@link javax.net.ssl.HostnameVerifier} implementation. @@ -78,7 +78,7 @@ enum HostNameType { } - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final PublicSuffixMatcher publicSuffixMatcher; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java index df82ba435..1ae07b357 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/H2TlsStrategy.java @@ -58,8 +58,8 @@ import org.apache.hc.core5.ssl.SSLContexts; import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TextUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Default SSL upgrade strategy for non-blocking connections. @@ -102,7 +102,7 @@ public static TlsStrategy getSystemDefault() { getDefaultHostnameVerifier()); } - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); private final SSLContext sslContext; private final String[] supportedProtocols; diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java index fcdd4969a..25dc62ae2 100644 --- a/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java +++ b/httpclient5/src/main/java/org/apache/hc/client5/http/ssl/SSLConnectionSocketFactory.java @@ -58,8 +58,8 @@ import org.apache.hc.core5.util.Args; import org.apache.hc.core5.util.TextUtils; import org.apache.hc.core5.util.TimeValue; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Layered socket factory for TLS/SSL connections. @@ -142,7 +142,7 @@ public class SSLConnectionSocketFactory implements LayeredConnectionSocketFactor public static final String TLS = "TLS"; public static final String SSL = "SSL"; - private final Logger log = LogManager.getLogger(getClass()); + private final Logger log = LoggerFactory.getLogger(getClass()); /** * @since 4.4 diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java index e11a534ce..783ba8268 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestInternalExecRuntime.java @@ -44,13 +44,13 @@ import org.apache.hc.core5.io.ShutdownType; import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; -import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.slf4j.Logger; @SuppressWarnings({"static-access"}) // test code public class TestInternalExecRuntime { diff --git a/pom.xml b/pom.xml index 241a01718..2f3d0f0af 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 1.10 3.4.0 2.12.3 - 1.7.13 + 1.7.25 4.12 2.5.2 2.7.22 @@ -98,22 +98,26 @@ httpcore5-testing ${httpcore.version} + + org.slf4j + slf4j-api + ${slf4j.version} + org.apache.logging.log4j log4j-api ${log4j.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + org.apache.logging.log4j log4j-core ${log4j.version} - test - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - test commons-codec