From 1e17d8eeeac091d625b6853f0c517dcd9b218c65 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Mon, 19 Jun 2023 09:55:44 +0100
Subject: [PATCH] Upgrade to Liquibase 4.22.0

Closes gh-35956
---
 .../spring-boot-actuator/build.gradle            |  1 +
 .../spring-boot-autoconfigure/build.gradle       |  1 +
 .../flyway/FlywayAutoConfigurationTests.java     | 16 +++++++---------
 .../spring-boot-dependencies/build.gradle        |  2 +-
 spring-boot-project/spring-boot/build.gradle     |  1 +
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator/build.gradle b/spring-boot-project/spring-boot-actuator/build.gradle
index c4e3930591..3f7999ca49 100644
--- a/spring-boot-project/spring-boot-actuator/build.gradle
+++ b/spring-boot-project/spring-boot-actuator/build.gradle
@@ -50,6 +50,7 @@ dependencies {
 	optional("org.hibernate.validator:hibernate-validator")
 	optional("org.influxdb:influxdb-java")
 	optional("org.liquibase:liquibase-core") {
+		exclude group: "javax.activation", module: "javax.activation-api"
 		exclude(group: "javax.xml.bind", module: "jaxb-api")
 	}
 	optional("org.mongodb:mongodb-driver-reactivestreams")
diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle
index db2a24fb50..03e84c8345 100644
--- a/spring-boot-project/spring-boot-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle
@@ -130,6 +130,7 @@ dependencies {
 		exclude group: "javax.xml.bind", module: "jaxb-api"
 	}
 	optional("org.liquibase:liquibase-core") {
+		exclude group: "javax.activation", module: "javax.activation-api"
 		exclude group: "javax.xml.bind", module: "jaxb-api"
 	}
 	optional("org.messaginghub:pooled-jms") {
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 8aa67ff189..b2149465d8 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
@@ -701,15 +701,13 @@ class FlywayAutoConfigurationTests {
 	void sqlServerKerberosLoginFileIsCorrectlyMapped() {
 		this.contextRunner.withUserConfiguration(EmbeddedDataSourceConfiguration.class)
 			.withPropertyValues("spring.flyway.sql-server-kerberos-login-file=/tmp/config")
-			.run((context) -> {
-				assertThat(context.getBean(Flyway.class)
-					.getConfiguration()
-					.getPluginRegister()
-					.getPlugin(SQLServerConfigurationExtension.class)
-					.getKerberos()
-					.getLogin()
-					.getFile()).isEqualTo("/tmp/config");
-			});
+			.run((context) -> assertThat(context.getBean(Flyway.class)
+				.getConfiguration()
+				.getPluginRegister()
+				.getPlugin(SQLServerConfigurationExtension.class)
+				.getKerberos()
+				.getLogin()
+				.getFile()).isEqualTo("/tmp/config"));
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index bb8f848ede..3cab5e9da2 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -803,7 +803,7 @@ bom {
 	}
 	library("Liquibase", "4.20.0") {
 		prohibit {
-			versionRange "[4.21.0,4.21.2)"
+			versionRange "[4.21.0,4.22.0]"
 			because "https://github.com/liquibase/liquibase/issues/4135"
 		}
 		group("org.liquibase") {
diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle
index f083119743..3a862fe98b 100644
--- a/spring-boot-project/spring-boot/build.gradle
+++ b/spring-boot-project/spring-boot/build.gradle
@@ -75,6 +75,7 @@ dependencies {
 		exclude(group: "javax.xml.bind", module: "jaxb-api")
 	}
 	optional("org.liquibase:liquibase-core") {
+		exclude group: "javax.activation", module: "javax.activation-api"
 		exclude(group: "javax.xml.bind", module: "jaxb-api")
 	}
 	optional("org.postgresql:postgresql")