diff --git a/pom.xml b/pom.xml index 5b0a3f35..b408642f 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ UTF-8 - 1.4.0.RELEASE + 1.4.1.RELEASE diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java index b5e5db97..b7028872 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StringUtils; @@ -42,16 +42,15 @@ import org.springframework.vault.core.VaultOperations; * referenced with {@code ../work/keystore.jks}. *

* This test requires AWS credentials and a region, see {@link #AWS_ACCESS_KEY}, - * {@link #AWS_SECRET_KEY} and the {@link IntegrationTest} properties to be provided + * {@link #AWS_SECRET_KEY} and the {@link SpringBootTest} properties to be provided * externally. * * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigAwsTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.aws.enabled=true", - "spring.cloud.vault.aws.role=readonly", "cloud.aws.region.auto=false", - "cloud.aws.region.static=eu-west-1" }) +@SpringBootTest(classes = VaultConfigAwsTests.TestApplication.class, properties = { + "spring.cloud.vault.aws.enabled=true", "spring.cloud.vault.aws.role=readonly", + "cloud.aws.region.auto=false", "cloud.aws.region.static=eu-west-1" }) public class VaultConfigAwsTests { private final static String AWS_REGION = "eu-west-1"; 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 b9bf2894..fd284fe2 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 @@ -40,6 +40,7 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.util.Base64Utils; import org.springframework.vault.core.VaultOperations; +import org.springframework.web.client.RestTemplate; /** * Integration tests for {@link VaultConfigTemplate} using the consul secret backend. This @@ -64,8 +65,7 @@ public class ConsulSecretIntegrationTests extends IntegrationTestSupport { private VaultProperties vaultProperties = Settings.createVaultProperties(); private VaultConfigOperations configOperations; private VaultConsulProperties consul = new VaultConsulProperties(); - - private TestRestTemplate restTemplate = new TestRestTemplate(); + private RestTemplate restTemplate = new RestTemplate(); /** * Initialize the postgresql secret backend. diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java index 5661e49a..4ec85ea2 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java @@ -31,8 +31,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.core.ParameterizedTypeReference; @@ -54,8 +53,8 @@ import org.springframework.web.client.RestTemplate; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigConsulTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.consul.enabled=true", +@SpringBootTest(classes = VaultConfigConsulTests.TestApplication.class, properties = { + "spring.cloud.vault.consul.enabled=true", "spring.cloud.vault.consul.role=readonly" }) public class VaultConfigConsulTests { diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java index fc8642cd..c179cf9c 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java @@ -31,8 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -51,8 +50,8 @@ import com.datastax.driver.core.Session; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigCassandraTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.cassandra.enabled=true", +@SpringBootTest(classes = VaultConfigCassandraTests.TestApplication.class, properties = { + "spring.cloud.vault.cassandra.enabled=true", "spring.cloud.vault.cassandra.role=readonly" }) public class VaultConfigCassandraTests { diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java index 3b93e249..fa55507c 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java @@ -31,8 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -47,9 +46,8 @@ import org.springframework.vault.core.VaultOperations; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigMySqlTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.mysql.enabled=true", - "spring.cloud.vault.mysql.role=readonly", +@SpringBootTest(classes = VaultConfigMySqlTests.TestApplication.class, properties = { + "spring.cloud.vault.mysql.enabled=true", "spring.cloud.vault.mysql.role=readonly", "spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false" }) public class VaultConfigMySqlTests { diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java index c102b302..10e28cc9 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java @@ -34,8 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -50,8 +49,8 @@ import org.springframework.vault.core.VaultOperations; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigPostgreSqlTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.postgresql.enabled=true", +@SpringBootTest(classes = VaultConfigPostgreSqlTests.TestApplication.class, properties = { + "spring.cloud.vault.postgresql.enabled=true", "spring.cloud.vault.postgresql.role=readonly", "spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?ssl=false" }) public class VaultConfigPostgreSqlTests { diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java index 59b808f0..1d13576f 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java @@ -30,8 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.CanConnect; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -50,8 +49,8 @@ import com.rabbitmq.client.ConnectionFactory; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigRabbitMqTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.rabbitmq.enabled=true", +@SpringBootTest(classes = VaultConfigRabbitMqTests.TestApplication.class, properties = { + "spring.cloud.vault.rabbitmq.enabled=true", "spring.cloud.vault.rabbitmq.role=readonly", "spring.rabbitmq.address=localhost" }) public class VaultConfigRabbitMqTests { diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java index 37af9455..33fffb10 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java @@ -29,8 +29,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.config.VaultConfigAppIdCustomMechanismTests.BootstrapConfiguration; import org.springframework.cloud.vault.util.Settings; import org.springframework.cloud.vault.util.VaultRule; @@ -48,10 +47,10 @@ import org.springframework.vault.core.VaultOperations; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { BootstrapConfiguration.class, - VaultConfigAppIdCustomMechanismTests.TestApplication.class }) -@IntegrationTest({ "spring.cloud.vault.authentication=appid", "use.custom.config=true", - "spring.application.name=VaultConfigAppIdCustomMechanismTests" }) +@SpringBootTest(classes = { BootstrapConfiguration.class, + VaultConfigAppIdCustomMechanismTests.TestApplication.class }, properties = { + "spring.cloud.vault.authentication=appid", "use.custom.config=true", + "spring.application.name=VaultConfigAppIdCustomMechanismTests" }) public class VaultConfigAppIdCustomMechanismTests { @BeforeClass @@ -115,8 +114,7 @@ public class VaultConfigAppIdCustomMechanismTests { @Bean ClientAuthentication clientAuthentication(VaultClient vaultClient) { return new AppIdAuthentication( - AppIdAuthenticationOptions - .builder() + AppIdAuthenticationOptions.builder() .appId("VaultConfigAppIdCustomMechanismTests") .userIdMechanism(new StaticUserIdMechanism()).build(), vaultClient); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java index 427310d8..78a7f3ca 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdTests.java @@ -27,8 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.Settings; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -44,8 +43,8 @@ import org.springframework.vault.core.VaultOperations; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigAppIdTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.authentication=appid", +@SpringBootTest(classes = VaultConfigAppIdTests.TestApplication.class, properties = { + "spring.cloud.vault.authentication=appid", "spring.cloud.vault.app-id.user-id=IP_ADDRESS", "spring.application.name=VaultConfigAppIdTests" }) public class VaultConfigAppIdTests { @@ -68,8 +67,7 @@ public class VaultConfigAppIdTests { String appId = VaultConfigAppIdTests.class.getSimpleName(); - vaultOperations.write( - "secret/" + VaultConfigAppIdTests.class.getSimpleName(), + vaultOperations.write("secret/" + VaultConfigAppIdTests.class.getSimpleName(), Collections.singletonMap("vault.value", "foo")); Map appIdData = new HashMap(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java index 21fb6cde..d7350448 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigDisabledTests.java @@ -25,8 +25,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; @@ -42,8 +41,7 @@ import org.springframework.vault.client.VaultClient; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigDisabledTests.TestApplication.class) -@IntegrationTest("spring.cloud.vault.enabled=false") +@SpringBootTest(classes = VaultConfigDisabledTests.TestApplication.class, properties = "spring.cloud.vault.enabled=false") public class VaultConfigDisabledTests { @BeforeClass diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java index b1e005cb..9823fc07 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigGenericBackendDisabledTests.java @@ -25,8 +25,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -40,8 +39,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigGenericBackendDisabledTests.TestApplication.class) -@IntegrationTest("spring.cloud.vault.generic.enabled=false") +@SpringBootTest(classes = VaultConfigGenericBackendDisabledTests.TestApplication.class, properties = "spring.cloud.vault.generic.enabled=false") public class VaultConfigGenericBackendDisabledTests { @BeforeClass diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java index dc242654..6f199b22 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; @@ -44,7 +44,7 @@ import org.springframework.web.client.RestTemplate; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigTests.TestApplication.class) +@SpringBootTest(classes = VaultConfigTests.TestApplication.class) public class VaultConfigTests { @BeforeClass diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java index 55189795..ccdde1d6 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java @@ -31,8 +31,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.Settings; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -47,8 +46,8 @@ import org.springframework.vault.core.VaultOperations; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigTlsCertAuthenticationTests.TestApplication.class) -@IntegrationTest({ "spring.cloud.vault.authentication=cert", +@SpringBootTest(classes = VaultConfigTlsCertAuthenticationTests.TestApplication.class, properties = { + "spring.cloud.vault.authentication=cert", "spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks", "spring.cloud.vault.ssl.key-store-password=changeit", "spring.application.name=VaultConfigTlsCertAuthenticationTests" }) diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java index 8956d86b..bc25fd20 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigWithContextTests.java @@ -25,7 +25,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.vault.util.VaultRule; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -40,7 +40,7 @@ import org.springframework.vault.core.VaultOperations; * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = VaultConfigWithContextTests.TestApplication.class) +@SpringBootTest(classes = VaultConfigWithContextTests.TestApplication.class) @ActiveProfiles("my-profile") public class VaultConfigWithContextTests { diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml index ef64f2ab..7ddbd4a8 100644 --- a/spring-cloud-vault-dependencies/pom.xml +++ b/spring-cloud-vault-dependencies/pom.xml @@ -21,7 +21,7 @@ 1.1.2.BUILD-SNAPSHOT - 1.4.0.RELEASE + 1.4.1.RELEASE 1.0.0.BUILD-SNAPSHOT 4.5.2 4.4.4