From 4a75798acc28c6d72d4576a294c1cb0c0d5bdf8e Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Tue, 16 Mar 2021 11:32:11 +0000
Subject: [PATCH] Upgrade to Flyway 7.7.0

Closes gh-25660
---
 .../flyway/FlywayAutoConfiguration.java       |  2 --
 .../flyway/FlywayProperties.java              | 26 -------------------
 .../flyway/FlywayAutoConfigurationTests.java  | 14 ----------
 .../spring-boot-dependencies/build.gradle     |  2 +-
 4 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
index 596a712ad4..5b5358f064 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -231,8 +231,6 @@ public class FlywayAutoConfiguration {
 					.to((skipExecutingMigrations) -> configuration.skipExecutingMigrations(skipExecutingMigrations));
 			// Teams secrets management properties (all non-method reference for
 			// compatibility with Flyway 6.x)
-			map.from(properties.getConjurUrl()).to((conjurUrl) -> configuration.conjurUrl(conjurUrl));
-			map.from(properties.getConjurToken()).to((conjurToken) -> configuration.conjurToken(conjurToken));
 			map.from(properties.getVaultUrl()).to((vaultUrl) -> configuration.vaultUrl(vaultUrl));
 			map.from(properties.getVaultToken()).to((vaultToken) -> configuration.vaultToken(vaultToken));
 			map.from(properties.getVaultSecrets()).whenNot(List::isEmpty)
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
index 9e42caf922..09df1c6006 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
@@ -332,16 +332,6 @@ public class FlywayProperties {
 	 */
 	private Boolean skipExecutingMigrations;
 
-	/**
-	 * REST API URL of the Conjur server. Requires Flyway teams.
-	 */
-	private String conjurUrl;
-
-	/**
-	 * Conjur token required to access secrets. Requires Flyway teams.
-	 */
-	private String conjurToken;
-
 	/**
 	 * REST API URL of the Vault server. Requires Flyway teams.
 	 */
@@ -808,22 +798,6 @@ public class FlywayProperties {
 		this.skipExecutingMigrations = skipExecutingMigrations;
 	}
 
-	public String getConjurUrl() {
-		return this.conjurUrl;
-	}
-
-	public void setConjurUrl(String conjurUrl) {
-		this.conjurUrl = conjurUrl;
-	}
-
-	public String getConjurToken() {
-		return this.conjurToken;
-	}
-
-	public void setConjurToken(String conjurToken) {
-		this.conjurToken = conjurToken;
-	}
-
 	public String getVaultUrl() {
 		return this.vaultUrl;
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
index 682e34cc07..ca9cef7cd0 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
@@ -537,20 +537,6 @@ class FlywayAutoConfigurationTests {
 				.run(validateFlywayTeamsPropertyOnly("skipExecutingMigrations"));
 	}
 
-	@Test
-	void conjurUrlIsCorrectlyMapped() {
-		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
-				.withPropertyValues("spring.flyway.conjur-url=http://foo.com/secrets")
-				.run(validateFlywayTeamsPropertyOnly("conjurUrl"));
-	}
-
-	@Test
-	void conjurTokenIsCorrectlyMapped() {
-		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
-				.withPropertyValues("spring.flyway.conjur-token=5150")
-				.run(validateFlywayTeamsPropertyOnly("conjurToken"));
-	}
-
 	@Test
 	void vaultUrlIsCorrectlyMapped() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index bccd9c0a3d..3b148eeb01 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -306,7 +306,7 @@ bom {
 			]
 		}
 	}
-	library("Flyway", "7.5.3") {
+	library("Flyway", "7.7.0") {
 		group("org.flywaydb") {
 			modules = [
 				"flyway-core"