From 78a76ef0a9e16d3ed05d7b87d4c1b2100dbfb6a3 Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Wed, 30 Mar 2022 16:51:00 +0200
Subject: [PATCH] Use JGit from Boot.

---
 pom.xml                                                       | 3 ++-
 .../src/main/java/releaser/internal/git/GitRepo.java          | 4 ++--
 .../src/test/java/releaser/internal/ReleaserTests.java        | 2 +-
 .../test/java/releaser/internal/github/GithubIssuesTests.java | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index de5f9ede..e4284fd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,8 @@
 		<jcabi-github.version>1.1.2</jcabi-github.version>
 		<jsch-agent.version>0.0.9</jsch-agent.version>
 		<hibernate-validator.version>7.0.2.Final</hibernate-validator.version>
-		<org.eclipse.jgit-version>6.0.0.202111291000-r</org.eclipse.jgit-version>
+		<!--Matches JGit in Boot:-->
+		<org.eclipse.jgit-version>5.12.0.202106070339-r</org.eclipse.jgit-version>
 		<!-- Versions plugin uses this version -->
 		<maven-model.version>3.8.4</maven-model.version>
 		<versions-maven-plugin.version>2.7</versions-maven-plugin.version>
diff --git a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java
index 9c380774..26a4b800 100644
--- a/releaser-core/src/main/java/releaser/internal/git/GitRepo.java
+++ b/releaser-core/src/main/java/releaser/internal/git/GitRepo.java
@@ -56,12 +56,12 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.FetchResult;
+import org.eclipse.jgit.transport.JschConfigSessionFactory;
+import org.eclipse.jgit.transport.OpenSshConfig;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.SshTransport;
 import org.eclipse.jgit.transport.URIish;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
-import org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory;
-import org.eclipse.jgit.transport.ssh.jsch.OpenSshConfig;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.FileUtils;
 import org.slf4j.Logger;
diff --git a/releaser-core/src/test/java/releaser/internal/ReleaserTests.java b/releaser-core/src/test/java/releaser/internal/ReleaserTests.java
index bfa5bd34..513bc71b 100644
--- a/releaser-core/src/test/java/releaser/internal/ReleaserTests.java
+++ b/releaser-core/src/test/java/releaser/internal/ReleaserTests.java
@@ -83,7 +83,7 @@ public class ReleaserTests {
 
 	File pom;
 
-	@Before
+	@BeforeEach
 	public void setup() throws URISyntaxException {
 		URI pomUri = ReleaserTests.class.getResource("/projects/project/pom.xml").toURI();
 		this.pom = new File(pomUri);
diff --git a/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java b/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java
index 0717f4fc..33133a06 100644
--- a/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java
+++ b/releaser-core/src/test/java/releaser/internal/github/GithubIssuesTests.java
@@ -16,7 +16,6 @@
 
 package releaser.internal.github;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Collections;