From a42b79356329867a0e6cb0429fcc45173a18e8d3 Mon Sep 17 00:00:00 2001
From: ZhangJian He <shoothzj@gmail.com>
Date: Tue, 12 Apr 2022 21:31:44 +0800
Subject: [PATCH] bump flyway version from 5.2.4 to 8.0.5

---
 CHANGES.md |  1 +
 pom.xml    | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index b9180526bcd..705767bc85f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -51,5 +51,6 @@ Apollo 2.0.0
 * [Upgrade spring boot to 2.6.6 and spring cloud to 2021.0.1](https://github.com/apolloconfig/apollo/pull/4295)
 * [Fix the apollo portal start failed issue](https://github.com/apolloconfig/apollo/pull/4298)
 * [fix: javax.net.ssl.SSLHandshakeException: No appropriate protocol](https://github.com/apolloconfig/apollo/pull/4308)
+* [Upgrade flyway to 8.0.5](https://github.com/apolloconfig/apollo/pull/4312)
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)
diff --git a/pom.xml b/pom.xml
index ee487c71c92..108ccb6808a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -693,7 +693,7 @@
 					<plugin>
 						<groupId>org.flywaydb</groupId>
 						<artifactId>flyway-maven-plugin</artifactId>
-						<version>5.2.4</version>
+						<version>8.0.5</version>
 						<dependencies>
 							<dependency>
 								<groupId>mysql</groupId>
@@ -702,7 +702,11 @@
 							</dependency>
 						</dependencies>
 						<configuration>
-							<configFile>scripts/flyway/flyway-configdb.properties</configFile>
+							<configFiles>
+								<configFile>
+									scripts/flyway/flyway-configdb.properties
+								</configFile>
+							</configFiles>
 						</configuration>
 						<inherited>false</inherited>
 					</plugin>
@@ -716,7 +720,7 @@
 					<plugin>
 						<groupId>org.flywaydb</groupId>
 						<artifactId>flyway-maven-plugin</artifactId>
-						<version>5.2.4</version>
+						<version>8.0.5</version>
 						<dependencies>
 							<dependency>
 								<groupId>mysql</groupId>
@@ -725,7 +729,11 @@
 							</dependency>
 						</dependencies>
 						<configuration>
-							<configFile>scripts/flyway/flyway-portaldb.properties</configFile>
+							<configFiles>
+								<configFile>
+									scripts/flyway/flyway-portaldb.properties
+								</configFile>
+							</configFiles>
 						</configuration>
 						<inherited>false</inherited>
 					</plugin>