From 9021b3805f41892e7935f2a41b5a7b6a9d1d9fb4 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 15 Jun 2020 16:32:55 -0400 Subject: [PATCH] Adds junit-vintage-engine --- spring-cloud-config-client/pom.xml | 5 +++++ spring-cloud-config-server/pom.xml | 5 +++++ .../environment/AwsS3EnvironmentRepositoryFactory.java | 1 + 3 files changed, 11 insertions(+) diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index d94a3582..cf8bf799 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -81,6 +81,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.springframework.cloud spring-cloud-test-support diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index ba03d2f2..50c95596 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -123,6 +123,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + org.springframework.cloud spring-cloud-test-support diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java index 5e14831e..a09b96f8 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/AwsS3EnvironmentRepositoryFactory.java @@ -37,6 +37,7 @@ public class AwsS3EnvironmentRepositoryFactory implements if (environmentProperties.getRegion() != null) { clientBuilder.withRegion(environmentProperties.getRegion()); } + clientBuilder.withClientConfiguration() final AmazonS3 client = clientBuilder.build(); if (environmentProperties.getEndpoint() != null) { client.setEndpoint(environmentProperties.getEndpoint());