diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 6f64179c..5a81c20a 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-config-dependencies Spring Cloud Config Dependencies - 6.10.1.202505221210-r + 7.3.0.202506031305-r 4.0.0-SNAPSHOT 2.1.1.RELEASE 2.0.10 diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java index 30d4e5ee..a46431b6 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java @@ -1189,12 +1189,11 @@ public class JGitEnvironmentRepositoryTests { // refresh()->merge MergeResult mergeResult = mock(MergeResult.class); - MergeResult.MergeStatus mergeStatus = mock(MergeResult.MergeStatus.class); + MergeResult.MergeStatus mergeStatus = MergeResult.MergeStatus.MERGED; MergeCommand mergeCommand = mock(MergeCommand.class); when(git.merge()).thenReturn(mergeCommand); when(mergeCommand.call()).thenReturn(mergeResult); when(mergeResult.getMergeStatus()).thenReturn(mergeStatus); - when(mergeStatus.isSuccessful()).thenReturn(true); SearchPathLocator.Locations locations = this.repository.getLocations("bar", "staging", "master"); assertThat(newObjectId.getName()).isEqualTo(locations.getVersion());