From fe8b46b6e8c33aedb46d51a7c5f7c3d3a7d50e75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 26 Jan 2025 20:26:32 +0000 Subject: [PATCH 1/2] Bump org.eclipse.jgit:org.eclipse.jgit Bumps [org.eclipse.jgit:org.eclipse.jgit](https://github.com/eclipse-jgit/jgit) from 6.10.0.202406032230-r to 7.1.0.202411261347-r. - [Commits](https://github.com/eclipse-jgit/jgit/compare/v6.10.0.202406032230-r...v7.1.0.202411261347-r) --- updated-dependencies: - dependency-name: org.eclipse.jgit:org.eclipse.jgit dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9eb143e01..c1bb908a8 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ dependencies { implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${springdocVersion}") implementation("com.github.FAForever:faf-java-commons:0e5d22ffff6e4dea81bac494d532627fcca8ebc4") implementation("org.kohsuke:github-api:1.326") - implementation("org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r") + implementation("org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r") implementation("org.jetbrains:annotations:26.0.2") implementation("com.google.guava:guava:33.4.0-jre") implementation("org.luaj:luaj-jse:3.0.1") From a0cf1becb55036ead8a3adac6f02c77feb534848 Mon Sep 17 00:00:00 2001 From: Brutus5000 Date: Sun, 26 Jan 2025 21:29:04 +0100 Subject: [PATCH 2/2] Fix JGit breakage from version bump --- src/main/java/com/faforever/api/deployment/git/JGitWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/faforever/api/deployment/git/JGitWrapper.java b/src/main/java/com/faforever/api/deployment/git/JGitWrapper.java index afb486e20..ef8f0caff 100644 --- a/src/main/java/com/faforever/api/deployment/git/JGitWrapper.java +++ b/src/main/java/com/faforever/api/deployment/git/JGitWrapper.java @@ -40,7 +40,7 @@ public void checkoutRef(Path repoDirectory, String ref) { log.debug("Checking out '{}' in '{}'", ref, repoDirectory); try (Git git = open(repoDirectory.toFile())) { git.checkout() - .setForce(true) + .setForceRefUpdate(true) .setName(ref) .call(); }