diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java index a5c00780..d53767ad 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java @@ -16,6 +16,7 @@ package org.springframework.cloud.vault.config.consul; +import java.util.Base64; import java.util.Collections; import java.util.Map; @@ -28,7 +29,6 @@ import org.springframework.cloud.vault.config.consul.VaultConfigConsulBootstrapConfiguration.ConsulSecretBackendMetadataFactory; import org.springframework.cloud.vault.util.IntegrationTestSupport; import org.springframework.cloud.vault.util.Settings; -import org.springframework.util.Base64Utils; import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; @@ -70,7 +70,7 @@ public void setUp() { SetupConsul.setupConsul(vaultOperations, this.consul.getBackend()); vaultOperations.write(String.format("%s/roles/%s", this.consul.getBackend(), this.consul.getRole()), - Collections.singletonMap("policy", Base64Utils.encodeToString(POLICY.getBytes()))); + Collections.singletonMap("policy", Base64.getEncoder().encodeToString(POLICY.getBytes()))); this.configOperations = new VaultConfigTemplate(vaultOperations, this.vaultProperties); } diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java index 2d1629e9..6952e815 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java @@ -16,6 +16,7 @@ package org.springframework.cloud.vault.config.consul; +import java.util.Base64; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; @@ -34,7 +35,6 @@ import org.springframework.cloud.vault.util.Settings; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.event.EventListener; -import org.springframework.util.Base64Utils; import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; @@ -65,7 +65,7 @@ public void before() { SetupConsul.setupConsul(vaultOperations, "consul"); Map role = new LinkedHashMap<>(); - role.put("policy", Base64Utils.encodeToString(POLICY.getBytes())); + role.put("policy", Base64.getEncoder().encodeToString(POLICY.getBytes())); role.put("ttl", "3s"); role.put("max_ttl", "3s"); vaultOperations.write(String.format("%s/roles/%s", "consul", "short-readonly"), role); diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 6a357d71..1f4d3e09 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -43,7 +43,7 @@ - com.datastax.oss + org.apache.cassandra java-driver-core test diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index c6176e69..a39cd909 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -20,7 +20,7 @@ Spring Cloud Vault Dependencies - 3.1.1 + 3.1.2-SNAPSHOT