Use the same spring version in micro-s3 tests as the rest of micro-se…

…rver
aol · Jul 21, 2017 · baefa86 · baefa86
1 parent e82e3ad
commit baefa86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/micro-s3/build.gradle b/micro-s3/build.gradle
@@ -5,7 +5,7 @@ dependencies {
 	compile 'com.amazonaws:aws-java-sdk:' + s3Version
 	compile project(':micro-core')
 	compile project(':micro-manifest-comparator')
-    testCompile group: 'org.springframework', name: 'spring-test', version: '4.0.5.RELEASE'
+    testCompile group: 'org.springframework', name: 'spring-test', version: springVersion
     testCompile group: 'io.dropwizard.metrics', name: 'metrics-core', version: '3.1.0'
     testCompile group: 'org.coursera', name: 'dropwizard-metrics-datadog', version: '1.1.6'
     testCompile group: 'com.github.cbismuth', name: 'junit-repeat-rule', version: '1.1.0'

diff --git a/micro-s3/src/test/java/com/aol/micro/server/s3/plugin/S3ClientProviderTest.java b/micro-s3/src/test/java/com/aol/micro/server/s3/plugin/S3ClientProviderTest.java
@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -19,6 +20,10 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes=S3ClientProvider.class, loader = AnnotationConfigContextLoader.class)
+@TestPropertySource(properties = {
+        "s3.accessKey=",
+        "s3.secretKey="
+})
 public class S3ClientProviderTest {
 
     @Autowired