diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2013-04-14 12:36:44 +0200 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2013-04-14 12:36:44 +0200 |
| commit | 2b7682680292bb2118790fa24aa597eb51c7f1a6 (patch) | |
| tree | 2e2860d52a079f421ea65b3dfa932606fccc3dd1 /src | |
| parent | 94793ed10acf996a4b3f9f1a8538a1b997436d9f (diff) | |
| download | gitblit-2b7682680292bb2118790fa24aa597eb51c7f1a6.tar.gz gitblit-2b7682680292bb2118790fa24aa597eb51c7f1a6.zip | |
Bump JGit version to 3.0.0-SNAPSHOT
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/gitblit/AddIndexedBranch.java | 6 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/GCExecutor.java | 6 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/GitBlit.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/utils/JGitUtils.java | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/main/java/com/gitblit/AddIndexedBranch.java b/src/main/java/com/gitblit/AddIndexedBranch.java index 66997060..67b77428 100644 --- a/src/main/java/com/gitblit/AddIndexedBranch.java +++ b/src/main/java/com/gitblit/AddIndexedBranch.java @@ -23,9 +23,11 @@ import java.util.List; 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 @@ public class AddIndexedBranch { 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 312baf5b..19393aa6 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.AtomicBoolean; 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 2c5bfe51..27ab6ecf 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; 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 c3aae275..8a02a652 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.RevTree; 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 @@ public class JGitUtils { 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 {
|