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

kwoyke · web-flow · commit 17488787a0cb · 2021-12-06T10:48:38.000+01:00
JAVA-8649: updating spring-cloud release train version in spring-cloud-vault and removing bootstrap.yml
diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/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>
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/application.yml b/spring-cloud/spring-cloud-vault/src/main/resources/application.yml
@@ -1,11 +1,34 @@
-spring:
-  application:
-    name: fakebank
-    
-  datasource:
-    url: jdbc:mysql://localhost:3306/fakebank?serverTimezone=GMT-3
-    hikari:      connection-test-query: select 1
-      idle-timeout: 5000
-      max-lifetime: 120000
-      maximum-pool-size: 5
-      minimum-idle: 5
+spring:
+  application:
+    name: fakebank
+  datasource:
+    url: jdbc:mysql://localhost:3306/fakebank?serverTimezone=GMT-3
+    hikari:
+      connection-test-query: select 1
+      idle-timeout: 5000
+      max-lifetime: 120000
+      maximum-pool-size: 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://
diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml b/spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
