From 455e9062c091c98e50e68d741b5c03b51f7f66fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 10:29:58 -0400 Subject: [PATCH] Bump jgit.version from 6.10.1.202505221210-r to 7.3.0.202506031305-r (#2888) * Bump jgit.version from 6.10.1.202505221210-r to 7.3.0.202506031305-r Bumps `jgit.version` from 6.10.1.202505221210-r to 7.3.0.202506031305-r. Updates `org.eclipse.jgit:org.eclipse.jgit` from 6.10.1.202505221210-r to 7.3.0.202506031305-r - [Commits](https://github.com/eclipse-jgit/jgit/compare/v6.10.1.202505221210-r...v7.3.0.202506031305-r) Updates `org.eclipse.jgit:org.eclipse.jgit.junit.http` from 6.10.1.202505221210-r to 7.3.0.202506031305-r - [Commits](https://github.com/eclipse-jgit/jgit/compare/v6.10.1.202505221210-r...v7.3.0.202506031305-r) Updates `org.eclipse.jgit:org.eclipse.jgit.http.apache` from 6.10.1.202505221210-r to 7.3.0.202506031305-r - [Commits](https://github.com/eclipse-jgit/jgit/compare/v6.10.1.202505221210-r...v7.3.0.202506031305-r) Updates `org.eclipse.jgit:org.eclipse.jgit.ssh.apache` from 6.10.1.202505221210-r to 7.3.0.202506031305-r - [Commits](https://github.com/eclipse-jgit/jgit/compare/v6.10.1.202505221210-r...v7.3.0.202506031305-r) --- updated-dependencies: - dependency-name: org.eclipse.jgit:org.eclipse.jgit dependency-version: 7.3.0.202506031305-r dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.jgit:org.eclipse.jgit.junit.http dependency-version: 7.3.0.202506031305-r dependency-type: direct:development update-type: version-update:semver-major - dependency-name: org.eclipse.jgit:org.eclipse.jgit.http.apache dependency-version: 7.3.0.202506031305-r dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.jgit:org.eclipse.jgit.ssh.apache dependency-version: 7.3.0.202506031305-r dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Fix tests with latest jgit version --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan Baxter --- spring-cloud-config-dependencies/pom.xml | 2 +- .../server/environment/JGitEnvironmentRepositoryTests.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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());