From 2b7682680292bb2118790fa24aa597eb51c7f1a6 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 14 Apr 2013 06:36:44 -0400
Subject: [PATCH] Bump JGit version to 3.0.0-SNAPSHOT
---
src/main/java/com/gitblit/GCExecutor.java | 6 +++---
src/main/java/com/gitblit/utils/JGitUtils.java | 5 +++--
src/main/java/com/gitblit/GitBlit.java | 2 +-
build.moxie | 4 ++--
src/main/java/com/gitblit/AddIndexedBranch.java | 6 ++++--
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/build.moxie b/build.moxie
index fe938a3..2c4c6c2 100644
--- a/build.moxie
+++ b/build.moxie
@@ -10,7 +10,7 @@
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
-version: 1.3.0-SNAPSHOT
+version: 1.4.0-SNAPSHOT
inceptionYear: 2011
# Current stable release
@@ -100,7 +100,7 @@
jetty.version : 7.6.8.v20121106
wicket.version : 1.4.21
lucene.version : 3.6.1
- jgit.version : 2.3.1.201302201838-r
+ jgit.version : 3.0.0-SNAPSHOT
groovy.version : 1.8.8
bouncycastle.version : 1.47
selenium.version : 2.28.0
diff --git a/src/main/java/com/gitblit/AddIndexedBranch.java b/src/main/java/com/gitblit/AddIndexedBranch.java
index 6699706..67b7742 100644
--- a/src/main/java/com/gitblit/AddIndexedBranch.java
+++ b/src/main/java/com/gitblit/AddIndexedBranch.java
@@ -23,9 +23,11 @@
import java.util.Set;
import java.util.TreeSet;
+import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.util.FS;
import com.beust.jcommander.JCommander;
@@ -86,7 +88,7 @@
try {
// load repository config
File gitDir = FileKey.resolve(new File(folder, repo), FS.DETECTED);
- FileRepository repository = new FileRepository(gitDir);
+ FileRepository repository = (FileRepository)new FileRepositoryBuilder().setGitDir(gitDir).build();
FileBasedConfig config = repository.getConfig();
config.load();
diff --git a/src/main/java/com/gitblit/GCExecutor.java b/src/main/java/com/gitblit/GCExecutor.java
index 312baf5..19393aa 100644
--- a/src/main/java/com/gitblit/GCExecutor.java
+++ b/src/main/java/com/gitblit/GCExecutor.java
@@ -25,9 +25,9 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.file.FileRepository;
-import org.eclipse.jgit.storage.file.GC;
-import org.eclipse.jgit.storage.file.GC.RepoStatistics;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.GC;
+import org.eclipse.jgit.internal.storage.file.GC.RepoStatistics;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 2c5bfe5..27ab6ec 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -71,7 +71,7 @@
import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.WindowCache;
+import org.eclipse.jgit.internal.storage.file.WindowCache;
import org.eclipse.jgit.storage.file.WindowCacheConfig;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.FileUtils;
diff --git a/src/main/java/com/gitblit/utils/JGitUtils.java b/src/main/java/com/gitblit/utils/JGitUtils.java
index c3aae27..8a02a65 100644
--- a/src/main/java/com/gitblit/utils/JGitUtils.java
+++ b/src/main/java/com/gitblit/utils/JGitUtils.java
@@ -67,7 +67,8 @@
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.revwalk.filter.CommitTimeRevFilter;
import org.eclipse.jgit.revwalk.filter.RevFilter;
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.RefSpec;
@@ -198,7 +199,7 @@
File folder = new File(repositoriesFolder, name);
if (folder.exists()) {
File gitDir = FileKey.resolve(new File(repositoriesFolder, name), FS.DETECTED);
- FileRepository repository = new FileRepository(gitDir);
+ FileRepository repository = (FileRepository)new FileRepositoryBuilder().setGitDir(gitDir).build();
result.fetchResult = fetchRepository(credentialsProvider, repository);
repository.close();
} else {
--
Gitblit v1.9.1