feature: upgrade spring-boot to 2.3.1.RELEASE, spring-cloud-dependencies to Hoxton.SR6, code adapter

Author: myoss

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>app.myoss.cloud</groupId>
         <artifactId>myoss-spring-boot-parent</artifactId>
-        <version>2.1.17.RELEASE</version>
+        <version>2.1.20.RELEASE</version>
     </parent>
 
     <groupId>app.myoss.cloud.mybatis</groupId>

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test2/UserHistoryControllerIntTests.java

@@ -33,7 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -77,7 +77,7 @@ public class UserHistoryControllerIntTests {
     @Autowired
     private UserHistoryService    userHistoryService;
     @Rule
-    public OutputCapture          output = new OutputCapture();
+    public OutputCaptureRule      output = new OutputCaptureRule();
     @Autowired
     private JdbcTemplate          jdbcTemplate;
 

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test3/UserLogControllerIntTests.java

@@ -33,7 +33,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -78,7 +78,7 @@ public class UserLogControllerIntTests {
     @Autowired
     private UserLogService    userLogService;
     @Rule
-    public OutputCapture      output = new OutputCapture();
+    public OutputCaptureRule  output = new OutputCaptureRule();
     @Autowired
     private JdbcTemplate      jdbcTemplate;
 

src/test/java/app/myoss/cloud/mybatis/test/integration/h2/test4/SysUserLogControllerIntTests.java

@@ -38,7 +38,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.rule.OutputCapture;
+import org.springframework.boot.test.system.OutputCaptureRule;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -90,7 +90,7 @@ public class SysUserLogControllerIntTests {
     @Autowired
     private SysUserLogMapper     userLogMapper;
     @Rule
-    public OutputCapture         output = new OutputCapture();
+    public OutputCaptureRule     output = new OutputCaptureRule();
     @Autowired
     private JdbcTemplate         jdbcTemplate;
 

src/test/resources/scripts/h2/1-init-schema.sql

@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `t_sys_user` (
   `modifier` varchar(32) NOT NULL COMMENT '修改者',
   `gmt_created` datetime NOT NULL COMMENT '创建时间',
   `gmt_modified` datetime NOT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`id`)
 );
 
 COMMENT ON TABLE `t_sys_user` IS '系统用户信息表';
@@ -60,7 +60,7 @@ CREATE TABLE IF NOT EXISTS `t_sys_user_history` (
   `modifier` varchar(32) NOT NULL COMMENT '修改者',
   `gmt_created` datetime NOT NULL COMMENT '创建时间',
   `gmt_modified` datetime NOT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`id`)
 );
 
 COMMENT ON TABLE `t_sys_user_history` IS '系统用户信息历史备份表';
@@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS `t_sys_user_log` (
   `modifier` varchar(32) NOT NULL COMMENT '修改者',
   `gmt_created` datetime NOT NULL COMMENT '创建时间',
   `gmt_modified` datetime NOT NULL COMMENT '修改时间',
-  PRIMARY KEY (`id`),
+  PRIMARY KEY (`id`)
 );
 
 COMMENT ON TABLE `t_sys_user_log` IS '系统用户日志记录表';