Merge branch 'stable-6.0'

* stable-6.0:
  FS: debug logging only if system config file cannot be found
  FS: debug logging only if system config file cannot be found
  Update .factorypath used by annotation processor for benchmarks
  Use  maven-compiler-plugin's release tag instead of source and target
  Don't use deprecated Repository#getAllRefs in Repository
  Don't use deprecated Repository#getAllRefs in FileRepository
  RevListTest: fix warning that method parameter hides field 'git'
  Implement RecordingLogger based on org.slf4j.Logger
  Let ObjectDatabase implement AutoClosable

Change-Id: Ie6b3cfa66b319033d4448dcf20362b753c0e9d7c

1 files changed, 9 insertions, 9 deletions

diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java
index 06fddc29d9..7c6cf4290e 100644
--- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java
+++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/RevListTest.java
@@ -55,21 +55,21 @@ public class RevListTest extends CLIRepositoryTestCase {
 		assertEquals(expect, result);
 	}
 
-	private List<RevCommit> createCommitsForParentsFlag(Git git)
+	private List<RevCommit> createCommitsForParentsFlag(Git repo)
 			throws Exception {
 		List<RevCommit> commits = new ArrayList<>();
 		writeTrashFile("Test1.txt", "Hello world");
-		git.add().addFilepattern("Test1.txt").call();
-		commits.add(git.commit().setMessage("commit#0").call());
+		repo.add().addFilepattern("Test1.txt").call();
+		commits.add(repo.commit().setMessage("commit#0").call());
 		writeTrashFile("Test.txt", "Hello world!");
-		git.add().addFilepattern("Test.txt").call();
-		commits.add(git.commit().setMessage("commit#1").call());
+		repo.add().addFilepattern("Test.txt").call();
+		commits.add(repo.commit().setMessage("commit#1").call());
 		writeTrashFile("Test1.txt", "Hello world!!");
-		git.add().addFilepattern("Test1.txt").call();
-		commits.add(git.commit().setMessage("commit#2").call());
+		repo.add().addFilepattern("Test1.txt").call();
+		commits.add(repo.commit().setMessage("commit#2").call());
 		writeTrashFile("Test.txt", "Hello world!!!");
-		git.add().addFilepattern("Test.txt").call();
-		commits.add(git.commit().setMessage("commit#3").call());
+		repo.add().addFilepattern("Test.txt").call();
+		commits.add(repo.commit().setMessage("commit#3").call());
 		return commits;
 	}
 }