From f7117c28a8d63fd1abcd7996b9cb519217b9ce8c Mon Sep 17 00:00:00 2001
From: spring-builds <builds@springframework.org>
Date: Fri, 4 Apr 2025 19:07:24 +0000
Subject: [PATCH 1/2] Bumping versions

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed032388..82b663ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 	<properties>
 		<spring-cloud-bus.version>4.1.4-SNAPSHOT</spring-cloud-bus.version>
 		<spring-cloud-commons.version>4.1.6-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.1.6-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-config.version>4.1.7-SNAPSHOT</spring-cloud-config.version>
 		<spring-cloud-deployer.version>2.8.3</spring-cloud-deployer.version>
 		<spring-cloud-openfeign.version>4.1.5-SNAPSHOT</spring-cloud-openfeign.version>
 		<spring-cloud-stream.version>4.1.6-SNAPSHOT</spring-cloud-stream.version>

From c07812d3ffbbe70a52bd8c9afbeb54b5e706320f Mon Sep 17 00:00:00 2001
From: Ryan Baxter <ryan.baxter@broadcom.com>
Date: Fri, 11 Apr 2025 09:36:37 -0400
Subject: [PATCH 2/2] Use Assert4J

---
 .../discovery/ConsulDiscoveryClientConfigurationTests.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java
index 29d67bcd..bf2579ac 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryClientConfigurationTests.java
@@ -27,7 +27,7 @@ import org.springframework.cloud.commons.util.UtilAutoConfiguration;
 import org.springframework.cloud.consul.ConsulAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Fail.fail;
 
 /**
  * @author Olga Maciaszek-Sharma