SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump jgit.version from 6.10.1.202505221210-r to 7.3.0.202506031305-r (#2888)

Browse Source 
* 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] <support@github.com>

* Fix tests with latest jgit version

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ryan Baxter <ryan.baxter@broadcom.com>
This commit is contained in:
dependabot[bot]
2025-06-10 10:29:58 -04:00
committed by GitHub
parent 2401b299ce
commit 455e9062c0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-dependencies/pom.xml
View File

@@ -15,7 +15,7 @@
<name>spring-cloud-config-dependencies</name>
<description>Spring Cloud Config Dependencies</description>
<properties>
<jgit.version>6.10.1.202505221210-r</jgit.version>
<jgit.version>7.3.0.202506031305-r</jgit.version>
<spring-vault.version>4.0.0-SNAPSHOT</spring-vault.version>
<spring-credhub.version>2.1.1.RELEASE</spring-credhub.version>
<spring-retry.version>2.0.10</spring-retry.version>

3
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepositoryTests.java
View File

@@ -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());