Skip to content

Commit

Permalink
Spring Boot upgraded
Browse files Browse the repository at this point in the history
  • Loading branch information
javastacks committed Aug 14, 2020
1 parent c1c33a2 commit b0eef9a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.3.2.RELEASE</version>
</parent>

<properties>
Expand Down
6 changes: 3 additions & 3 deletions spring-boot-druid/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<version>2.1.3.RELEASE</version>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>11.2.0.1.0</version>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.21</version>
</dependency>
</dependencies>

Expand Down
28 changes: 14 additions & 14 deletions spring-boot-druid/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
spring:
datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.11.151:1521/pdb_dev
username: develop
password: 0
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/javastack
username: root
password: 123456
druid:
one:
driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.11.151:1521/pdb_dev
username: develop
password: 0
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/javastack
username: root
password: 123456
initial-size: 10
max-active: 10
min-idle: 5
max-wait: 60000
two:
driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.11.151:1521/pdb_dev
username: develop
password: 0
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://localhost:3306/javastack
username: root
password: 123456
initial-size: 10
max-active: 10
min-idle: 5
Expand All @@ -29,5 +29,5 @@ spring:
stat-view-servlet:
enabled: true
url-pattern: /druid/*
login-username: develop
login-password: 0
login-username: root
login-password: 123456

0 comments on commit b0eef9a

Please sign in to comment.