diff --git a/jwt/pom.xml b/jwt/pom.xml
index fee1953..d70f109 100644
--- a/jwt/pom.xml
+++ b/jwt/pom.xml
@@ -27,6 +27,10 @@
io.jsonwebtoken
jjwt-jackson
+
+ org.slf4j
+ slf4j-api
+
diff --git a/pom.xml b/pom.xml
index b138bef..e193860 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,13 +44,13 @@
2020.0.32
5.1.0
2.18.2
+ 1.7.36
0.11.2
4.6.1
5.8.2
1.3
1.20.1
- 2.0.7
https://maven.pkg.github.com/scalecube/scalecube-security
@@ -108,11 +108,7 @@
org.testcontainers
vault
${testcontainers.version}
-
-
- com.bettercloud
- vault-java-driver
- ${vault-java-driver.version}
+ test
diff --git a/tokens/pom.xml b/tokens/pom.xml
index 078c297..f8cc898 100644
--- a/tokens/pom.xml
+++ b/tokens/pom.xml
@@ -27,6 +27,10 @@
io.jsonwebtoken
jjwt-jackson
+
+ org.slf4j
+ slf4j-api
+
org.testcontainers
diff --git a/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java b/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java
index 79190b3..72c679e 100644
--- a/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java
+++ b/tokens/src/main/java/io/scalecube/security/tokens/jwt/JwtTokenResolverImpl.java
@@ -1,8 +1,6 @@
package io.scalecube.security.tokens.jwt;
import io.scalecube.security.tokens.jwt.jsonwebtoken.JsonwebtokenParserFactory;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
import java.security.Key;
import java.time.Duration;
import java.util.Map;
@@ -10,13 +8,15 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Scheduler;
import reactor.core.scheduler.Schedulers;
public final class JwtTokenResolverImpl implements JwtTokenResolver {
- private static final Logger LOGGER = System.getLogger(JwtTokenResolver.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(JwtTokenResolver.class);
private KeyProvider keyProvider;
private JwtTokenParserFactory tokenParserFactory = new JsonwebtokenParserFactory();
@@ -100,7 +100,7 @@ public Mono
+
+ org.slf4j
+ slf4j-api
+
diff --git a/vault/src/main/java/io/scalecube/security/vault/VaultServiceRolesInstaller.java b/vault/src/main/java/io/scalecube/security/vault/VaultServiceRolesInstaller.java
index 25cc31f..7a8e668 100644
--- a/vault/src/main/java/io/scalecube/security/vault/VaultServiceRolesInstaller.java
+++ b/vault/src/main/java/io/scalecube/security/vault/VaultServiceRolesInstaller.java
@@ -13,8 +13,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
import java.util.Arrays;
import java.util.Base64;
import java.util.Collections;
@@ -23,10 +21,12 @@
import java.util.StringJoiner;
import java.util.function.Function;
import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class VaultServiceRolesInstaller {
- private static final Logger LOGGER = System.getLogger(VaultServiceRolesInstaller.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(VaultServiceRolesInstaller.class);
private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
@@ -64,13 +64,13 @@ private VaultServiceRolesInstaller(Builder builder) {
*/
public void install() {
if (isNullOrNoneOrEmpty(vaultAddress)) {
- LOGGER.log(Level.DEBUG, "Skipping serviceRoles installation, vaultAddress not set");
+ LOGGER.debug("Skipping serviceRoles installation, vaultAddress not set");
return;
}
final ServiceRoles serviceRoles = loadServiceRoles();
if (serviceRoles == null || serviceRoles.roles.isEmpty()) {
- LOGGER.log(Level.DEBUG, "Skipping serviceRoles installation, serviceRoles not set");
+ LOGGER.debug("Skipping serviceRoles installation, serviceRoles not set");
return;
}
@@ -86,7 +86,7 @@ public void install() {
rest.url(buildVaultIdentityRoleUri(roleName)), keyName, roleName, role.permissions);
}
- LOGGER.log(Level.DEBUG, "Installed serviceRoles ({0})", serviceRoles);
+ LOGGER.debug("Installed serviceRoles ({})", serviceRoles);
}
private ServiceRoles loadServiceRoles() {
@@ -111,7 +111,7 @@ private static void verifyOk(int status) {
}
private void createVaultIdentityKey(Rest rest, String keyName) {
- LOGGER.log(Level.DEBUG, "[createVaultIdentityKey] {0}", keyName);
+ LOGGER.debug("[createVaultIdentityKey] {}", keyName);
byte[] body =
Json.object()
@@ -131,7 +131,7 @@ private void createVaultIdentityKey(Rest rest, String keyName) {
private void createVaultIdentityRole(
Rest rest, String keyName, String roleName, List permissions) {
- LOGGER.log(Level.DEBUG, "[createVaultIdentityRole] {0}", roleName);
+ LOGGER.debug("[createVaultIdentityRole] {}", roleName);
byte[] body =
Json.object()
diff --git a/vault/src/main/java/io/scalecube/security/vault/VaultServiceTokenSupplier.java b/vault/src/main/java/io/scalecube/security/vault/VaultServiceTokenSupplier.java
index 159fee4..1d8fe70 100644
--- a/vault/src/main/java/io/scalecube/security/vault/VaultServiceTokenSupplier.java
+++ b/vault/src/main/java/io/scalecube/security/vault/VaultServiceTokenSupplier.java
@@ -4,17 +4,17 @@
import com.bettercloud.vault.rest.Rest;
import com.bettercloud.vault.rest.RestException;
import com.bettercloud.vault.rest.RestResponse;
-import java.lang.System.Logger;
-import java.lang.System.Logger.Level;
import java.util.Map;
import java.util.Objects;
import java.util.StringJoiner;
import java.util.function.BiFunction;
import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class VaultServiceTokenSupplier {
- private static final Logger LOGGER = System.getLogger(VaultServiceTokenSupplier.class.getName());
+ private static final Logger LOGGER = LoggerFactory.getLogger(VaultServiceTokenSupplier.class);
private static final String VAULT_TOKEN_HEADER = "X-Vault-Token";
@@ -44,8 +44,7 @@ public String getToken(Map tags) {
final String vaultToken = vaultTokenSupplier.get();
final String uri = toServiceTokenUri(tags);
final String token = rpcGetToken(uri, vaultToken);
- LOGGER.log(
- Level.DEBUG, "[getToken][success] uri={0}, tags={1}, result={2}", uri, tags, mask(token));
+ LOGGER.debug("[getToken][success] uri={}, tags={}, result={}", uri, tags, mask(token));
return token;
} catch (Exception ex) {
throw new RuntimeException(ex);