Merge pull request #11536 from chaos2418/JAVA-8649-1

JAVA-8649: updating spring-cloud release train version in spring-cloud-vault and removing bootstrap.yml

spring-cloud/spring-cloud-vault/pom.xml

@@ -78,7 +78,7 @@
     </build>
 
     <properties>
-        <spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
+        <spring-cloud.version>2020.0.3</spring-cloud.version>
     </properties>
 
 </project>

spring-cloud/spring-cloud-vault/src/main/resources/application.yml

@@ -1,11 +1,34 @@
-spring:
+spring:
-  application:
+  application:
-    name: fakebank
+    name: fakebank
-    
+  datasource:
-  datasource:
+    url: jdbc:mysql://localhost:3306/fakebank?serverTimezone=GMT-3
-    url: jdbc:mysql://localhost:3306/fakebank?serverTimezone=GMT-3
+    hikari:
-    hikari:
      connection-test-query: select 1
+      connection-test-query: select 1
-      idle-timeout: 5000
+      idle-timeout: 5000
-      max-lifetime: 120000
+      max-lifetime: 120000
-      maximum-pool-size: 5
+      maximum-pool-size: 5
-      minimum-idle: 5
+      minimum-idle: 5
+  cloud:
+    vault:
+      uri: https://localhost:8200
+      connection-timeout: 5000
+      read-timeout: 15000
+      ssl:
+        trust-store: classpath:/vault.jks
+        trust-store-password: changeit
+      generic:
+        enabled: true
+        application-name: fakebank
+      #      kv:
+      #        enabled: false
+      #        backend: kv
+      #        application-name: fakebank
+      database:
+        enabled: true
+        role: fakebank-accounts-ro
+        backend: database
+        username-property: spring.datasource.username
+        password-property: spring.datasource.password
+  config:
+    import: vault://

spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml

@@ -1,37 +0,0 @@
-spring:
-  cloud:
-    vault:
-      uri: https://localhost:8200
-      connection-timeout: 5000
-      read-timeout: 15000
-          
-      ssl:
-        trust-store: classpath:/vault.jks
-        trust-store-password: changeit
-      
-      generic:
-        enabled: true
-        application-name: fakebank
-        
-#      kv:
-#        enabled: false
-#        backend: kv
-#        application-name: fakebank
-#        
-      database:
-        enabled: true
-        role: fakebank-accounts-rw
-        backend: database
-        username-property: spring.datasource.username
-        password-property: spring.datasource.password
-#
-#        
-        
-              
-        
-      
-      
-        
-      
-          
-