Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1 from imod/jgit-3.0
[FIXED JENKINS-18973] update jgit to same version as used by git-client
  • Loading branch information
jglick committed Aug 9, 2013
2 parents d19d6b1 + 2feaeeb commit 2ad2d23
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
8 changes: 6 additions & 2 deletions pom.xml
Expand Up @@ -10,6 +10,10 @@
<artifactId>git-server</artifactId>
<version>1.2-SNAPSHOT</version>
<packaging>hpi</packaging>

<properties>
<jgit.version>3.0.0.201306101825-r</jgit.version>
</properties>

<name>Git server plugin</name>
<description>
Expand Down Expand Up @@ -47,13 +51,13 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId>
<version>1.1.0.201109151100-r</version>
<version>${jgit.version}</version>
</dependency>

<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>1.1.0.201109151100-r</version>
<version>${jgit.version}</version>
</dependency>
</dependencies>

Expand Down
Expand Up @@ -8,7 +8,6 @@
import org.eclipse.jgit.errors.NotSupportedException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.BasePackFetchConnection;
import org.eclipse.jgit.transport.BasePackPushConnection;
Expand Down Expand Up @@ -99,7 +98,7 @@ public GitFetchTask(Pipe l2r, Pipe r2l) {
}

public Void invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
FileRepository repo = new FileRepositoryBuilder().setWorkTree(f).build();
Repository repo = new FileRepositoryBuilder().setWorkTree(f).build();
try {
final UploadPack rp = new UploadPack(repo);
rp.upload(new BufferedInputStream(l2r.getIn()), new BufferedOutputStream(r2l.getOut()), null);
Expand All @@ -122,7 +121,7 @@ public GitPushTask(Pipe l2r, Pipe r2l) {
}

public Void invoke(File f, VirtualChannel channel) throws IOException, InterruptedException {
FileRepository repo = new FileRepositoryBuilder().setWorkTree(f).build();
Repository repo = new FileRepositoryBuilder().setWorkTree(f).build();
try {
final ReceivePack rp = new ReceivePack(repo);
rp.receive(new BufferedInputStream(l2r.getIn()), new BufferedOutputStream(r2l.getOut()), null);
Expand Down
Expand Up @@ -10,7 +10,6 @@
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.PostReceiveHook;
import org.eclipse.jgit.transport.ReceiveCommand;
Expand Down Expand Up @@ -49,7 +48,7 @@ protected FileBackedHttpGitRepository(File workspace) {

@Override
public Repository openRepository() throws IOException {
FileRepository r = new FileRepositoryBuilder().setWorkTree(workspace).build();
Repository r = new FileRepositoryBuilder().setWorkTree(workspace).build();

// if the repository doesn't exist, create it
if (!r.getObjectDatabase().exists()) {
Expand All @@ -63,7 +62,7 @@ public Repository openRepository() throws IOException {
*
* This implementation also imports whatever currently in there into the repository.
*/
protected void createInitialRepository(FileRepository r) throws IOException {
protected void createInitialRepository(Repository r) throws IOException {
r.create();

try {
Expand Down

0 comments on commit 2ad2d23

Please sign in to comment.