From c7283d83e767ebd4213f9900b1cb8602257141e7 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 10 Apr 2023 19:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.4.0=E3=80=91=E5=8D=87=E7=BA=A77.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                            | 18 +++++++++++++++---
 src/main/resources/application.yml |  2 ++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 89174a99..97f7f833 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.2</version>
+        <version>2.6.14</version>
     </parent>
 
     <groupId>cn.stylefeng</groupId>
     <artifactId>guns</artifactId>
-    <version>7.3.4</version>
+    <version>7.4.0</version>
 
     <name>guns</name>
     <description>Guns主项目</description>
@@ -24,8 +24,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <mysql-connector-java.version>8.0.21</mysql-connector-java.version>
-        <roses.kernel.version>7.3.4</roses.kernel.version>
+        <roses.kernel.version>7.4.0</roses.kernel.version>
         <docker.img.version>latest</docker.img.version>
+        <flyway.version>7.1.1</flyway.version>
     </properties>
 
     <dependencies>
@@ -56,6 +57,17 @@
             <groupId>cn.stylefeng.roses</groupId>
             <artifactId>db-spring-boot-starter</artifactId>
             <version>${roses.kernel.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>flyway-core</artifactId>
+                    <groupId>org.flywaydb</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+            <version>${flyway.version}</version>
         </dependency>
 
         <!--文件管理-->
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6f8066cc..3b1acdf5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,6 +7,8 @@ spring:
     name: guns
   profiles:
     active: @spring.active@
+  main:
+    allow-circular-references: true
   mvc:
     view:
       prefix: /pages