diff --git a/pom.xml b/pom.xml index cc4ba051..347e4aef 100644 --- a/pom.xml +++ b/pom.xml @@ -132,13 +132,6 @@ test - - ch.qos.logback - logback-classic - 1.1.7 - test - - @@ -711,4 +704,4 @@ - \ No newline at end of file + diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml index 4567c63c..e59ab27b 100644 --- a/spring-vault-core/pom.xml +++ b/spring-vault-core/pom.xml @@ -34,17 +34,6 @@ spring-web - - org.slf4j - slf4j-api - - - - org.slf4j - jcl-over-slf4j - runtime - - org.apache.httpcomponents httpclient @@ -99,19 +88,12 @@ test - - ch.qos.logback - logback-classic - test - - org.projectlombok lombok 1.16.10 true - - \ No newline at end of file + diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java index ac63f54e..26ba7e37 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppIdAuthentication.java @@ -18,8 +18,8 @@ package org.springframework.vault.authentication; import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; import org.springframework.vault.client.VaultClient; @@ -41,8 +41,7 @@ import org.springframework.vault.support.VaultToken; */ public class AppIdAuthentication implements ClientAuthentication { - private final static Logger logger = LoggerFactory - .getLogger(AppIdAuthentication.class); + private final static Log logger = LogFactory.getLog(AppIdAuthentication.class); private final AppIdAuthenticationOptions options; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java index 724d48d8..ba12c503 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AppRoleAuthentication.java @@ -18,8 +18,8 @@ package org.springframework.vault.authentication; import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; import org.springframework.vault.client.VaultClient; @@ -43,8 +43,7 @@ import org.springframework.vault.support.VaultToken; */ public class AppRoleAuthentication implements ClientAuthentication { - private final static Logger logger = LoggerFactory - .getLogger(AppRoleAuthentication.class); + private final static Log logger = LogFactory.getLog(AppRoleAuthentication.class); private final AppRoleAuthenticationOptions options; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java index 76bac05e..1de811a4 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/AwsEc2Authentication.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -47,8 +47,7 @@ import org.springframework.web.client.RestTemplate; */ public class AwsEc2Authentication implements ClientAuthentication { - private final static Logger logger = LoggerFactory - .getLogger(AwsEc2Authentication.class); + private final static Log logger = LogFactory.getLog(AwsEc2Authentication.class); private final AwsEc2AuthenticationOptions options; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java index 530892db..436dcad6 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/ClientCertificateAuthentication.java @@ -17,8 +17,8 @@ package org.springframework.vault.authentication; import java.util.Collections; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; import org.springframework.vault.client.VaultClient; @@ -34,8 +34,8 @@ import org.springframework.vault.support.VaultToken; */ public class ClientCertificateAuthentication implements ClientAuthentication { - private final static Logger logger = LoggerFactory - .getLogger(ClientCertificateAuthentication.class); + private final static Log logger = LogFactory + .getLog(ClientCertificateAuthentication.class); private final VaultClient vaultClient; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java index e2557c99..28a3764e 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/CubbyholeAuthentication.java @@ -17,8 +17,8 @@ package org.springframework.vault.authentication; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; import org.springframework.vault.client.VaultClient; @@ -114,8 +114,7 @@ import org.springframework.vault.support.VaultToken; */ public class CubbyholeAuthentication implements ClientAuthentication { - private final static Logger logger = LoggerFactory - .getLogger(CubbyholeAuthentication.class); + private final static Log logger = LogFactory.getLog(CubbyholeAuthentication.class); private final CubbyholeAuthenticationOptions options; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java index 0729e3b2..9b8450a8 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/LifecycleAwareSessionManager.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.core.task.AsyncTaskExecutor; @@ -59,8 +59,8 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB public static final int REFRESH_PERIOD_BEFORE_EXPIRY = 5; - private final static Logger logger = LoggerFactory - .getLogger(LifecycleAwareSessionManager.class); + private final static Log logger = LogFactory + .getLog(LifecycleAwareSessionManager.class); private final ClientAuthentication clientAuthentication; private final VaultClient vaultClient; @@ -100,8 +100,8 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB "auth/token/revoke-self", token, null, Map.class); if (!response.isSuccessful()) { - logger.warn("Cannot revoke VaultToken: {}", - buildExceptionMessage(response)); + logger.warn(String.format("Cannot revoke VaultToken: %s", + buildExceptionMessage(response))); } } } @@ -130,9 +130,9 @@ public class LifecycleAwareSessionManager implements SessionManager, DisposableB if (!response.isSuccessful()) { if (response.getStatusCode().is4xxClientError()) { - logger.debug( - "Cannot refresh token, resetting token and performing re-login: {}", - buildExceptionMessage(response)); + logger.debug(String + .format("Cannot refresh token, resetting token and performing re-login: %s", + buildExceptionMessage(response))); token = null; return false; } diff --git a/spring-vault-core/src/main/java/org/springframework/vault/authentication/MacAddressUserId.java b/spring-vault-core/src/main/java/org/springframework/vault/authentication/MacAddressUserId.java index e22e121a..50c82cea 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/authentication/MacAddressUserId.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/authentication/MacAddressUserId.java @@ -22,8 +22,8 @@ import java.net.NetworkInterface; import java.util.Collections; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -39,7 +39,7 @@ import org.springframework.util.StringUtils; */ public class MacAddressUserId implements AppIdUserIdMechanism { - private final Logger log = LoggerFactory.getLogger(MacAddressUserId.class); + private final Log log = LogFactory.getLog(MacAddressUserId.class); private final String networkInterfaceHint; diff --git a/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java b/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java index a66232fc..10db97af 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/config/ClientHttpRequestFactoryFactory.java @@ -31,12 +31,12 @@ import javax.net.ssl.TrustManagerFactory; import com.squareup.okhttp.OkHttpClient; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.SslProvider; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.http.client.config.RequestConfig; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; import org.springframework.http.client.ClientHttpRequestFactory; @@ -59,8 +59,8 @@ import org.springframework.vault.support.SslConfiguration; */ public class ClientHttpRequestFactoryFactory { - private static final Logger logger = LoggerFactory - .getLogger(ClientHttpRequestFactoryFactory.class); + private static final Log logger = LogFactory + .getLog(ClientHttpRequestFactoryFactory.class); private static final boolean HTTP_COMPONENTS_PRESENT = ClassUtils.isPresent( "org.apache.http.client.HttpClient", diff --git a/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java b/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java index f4c0abf7..b3fa901a 100644 --- a/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java +++ b/spring-vault-core/src/main/java/org/springframework/vault/core/env/VaultPropertySource.java @@ -19,8 +19,8 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.PropertySource; @@ -40,8 +40,7 @@ import org.springframework.vault.support.VaultResponse; */ public class VaultPropertySource extends EnumerablePropertySource { - protected final static Logger logger = LoggerFactory - .getLogger(VaultPropertySource.class); + protected final static Log logger = LogFactory.getLog(VaultPropertySource.class); private final String path; private final Map properties = new LinkedHashMap(); diff --git a/spring-vault-core/src/test/resources/logback.xml b/spring-vault-core/src/test/resources/logback.xml deleted file mode 100644 index aef48f62..00000000 --- a/spring-vault-core/src/test/resources/logback.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - %d %5p %40.40c:%4L - %m%n - - - - - - - - - - \ No newline at end of file diff --git a/spring-vault-core/src/test/resources/logging.properties b/spring-vault-core/src/test/resources/logging.properties index 36424839..28c2c521 100644 --- a/spring-vault-core/src/test/resources/logging.properties +++ b/spring-vault-core/src/test/resources/logging.properties @@ -1 +1 @@ -handlers=org.slf4j.bridge.SLF4JBridgeHandler +handlers=org.apache.commons.logging.impl.SimpleLog diff --git a/spring-vault-dependencies/pom.xml b/spring-vault-dependencies/pom.xml index 48fb6a92..46b9e259 100644 --- a/spring-vault-dependencies/pom.xml +++ b/spring-vault-dependencies/pom.xml @@ -18,7 +18,6 @@ 4.1.4.Final 2.7.5 2.8.2 - 1.7.21 @@ -42,26 +41,6 @@ org.springframework spring-core ${spring.version} - - - commons-logging - commons-logging - - - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - runtime