Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1748878

Browse filesBrowse files
authored
Merge pull request eugenp#11536 from chaos2418/JAVA-8649-1
JAVA-8649: updating spring-cloud release train version in spring-cloud-vault and removing bootstrap.yml
2 parents de21d61 + 7259227 commit 1748878
Copy full SHA for 1748878

File tree

Expand file treeCollapse file tree

3 files changed

+35
-49
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

3 files changed

+35
-49
lines changed
Open diff view settings
Collapse file

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

Copy file name to clipboardExpand all lines: spring-cloud/spring-cloud-vault/pom.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</build>
7979

8080
<properties>
81-
<spring-cloud.version>Greenwich.RELEASE</spring-cloud.version>
81+
<spring-cloud.version>2020.0.3</spring-cloud.version>
8282
</properties>
8383

8484
</project>
Collapse file
+34-11Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,34 @@
1-
spring:
2-
application:
3-
name: fakebank
4-
5-
datasource:
6-
url: jdbc:mysql://localhost:3306/fakebank?serverTimezone=GMT-3
7-
hikari: connection-test-query: select 1
8-
idle-timeout: 5000
9-
max-lifetime: 120000
10-
maximum-pool-size: 5
11-
minimum-idle: 5
1+
spring:
2+
application:
3+
name: fakebank
4+
datasource:
5+
url: jdbc:mysql://localhost:3306/fakebank?serverTimezone=GMT-3
6+
hikari:
7+
connection-test-query: select 1
8+
idle-timeout: 5000
9+
max-lifetime: 120000
10+
maximum-pool-size: 5
11+
minimum-idle: 5
12+
cloud:
13+
vault:
14+
uri: https://localhost:8200
15+
connection-timeout: 5000
16+
read-timeout: 15000
17+
ssl:
18+
trust-store: classpath:/vault.jks
19+
trust-store-password: changeit
20+
generic:
21+
enabled: true
22+
application-name: fakebank
23+
# kv:
24+
# enabled: false
25+
# backend: kv
26+
# application-name: fakebank
27+
database:
28+
enabled: true
29+
role: fakebank-accounts-ro
30+
backend: database
31+
username-property: spring.datasource.username
32+
password-property: spring.datasource.password
33+
config:
34+
import: vault://
Collapse file

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

Copy file name to clipboardExpand all lines: spring-cloud/spring-cloud-vault/src/main/resources/bootstrap.yml
-37Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.