@@ -10,7 +10,7 @@ name: Gitblit | |||
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 @@ properties: { | |||
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 |
@@ -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(); | |||
@@ -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; | |||
@@ -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; |
@@ -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 { |