Switch to the new org.eclipse.jgit package Adds support for core.logAllRefUpdates, and also moves us to the new org.eclipse.jgit namespace, which is the future of the JGit project. Unfortunately this version is a pre-release version which comes with some risk that the project history will be rewritten, possibly allowing this version to become lost in time. Change-Id: I780d2b3f0af66f32f31f74ff8f3fa14fdaad721d Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/pom.xml b/pom.xml index 8a9518b..894a9a8 100644 --- a/pom.xml +++ b/pom.xml
@@ -253,7 +253,7 @@ </licenses> <properties> - <jgitVersion>0.5.0-93-g5b89a2c</jgitVersion> + <jgitVersion>0.6.0-23-g36af95b7</jgitVersion> <gwtormVersion>1.1.2</gwtormVersion> <gwtjsonrpcVersion>1.1.1</gwtjsonrpcVersion> <gwtexpuiVersion>1.1.3</gwtexpuiVersion> @@ -610,37 +610,18 @@ </dependency> <dependency> - <groupId>org.spearce</groupId> + <groupId>org.eclipse</groupId> <artifactId>jgit</artifactId> <version>${jgitVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> - <groupId>org.spearce</groupId> + <groupId>org.eclipse</groupId> <artifactId>jgit</artifactId> <version>${jgitVersion}</version> <classifier>sources</classifier> <scope>provided</scope> <type>jar</type> - <exclusions> - <exclusion> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>com.jcraft</groupId> - <artifactId>jsch</artifactId> - <version>0.1.41</version> - <scope>compile</scope> </dependency> <dependency>
diff --git a/src/main/java/com/google/gerrit/Gerrit.gwt.xml b/src/main/java/com/google/gerrit/Gerrit.gwt.xml index ca73692..ebb833f 100644 --- a/src/main/java/com/google/gerrit/Gerrit.gwt.xml +++ b/src/main/java/com/google/gerrit/Gerrit.gwt.xml
@@ -24,7 +24,7 @@ <inherits name='com.google.gwtexpui.progress.Progress'/> <inherits name='com.google.gwtexpui.safehtml.SafeHtml'/> <inherits name='com.google.gerrit.UserAgent'/> - <inherits name='org.spearce.jgit.JGit'/> + <inherits name='org.eclipse.jgit.JGit'/> <stylesheet src='gerrit.css' /> <stylesheet src='prettify20090521/prettify.css' /> <extend-property name="locale" values="en"/>
diff --git a/src/main/java/com/google/gerrit/client/data/EditList.java b/src/main/java/com/google/gerrit/client/data/EditList.java index faf9c27..019eaf0 100644 --- a/src/main/java/com/google/gerrit/client/data/EditList.java +++ b/src/main/java/com/google/gerrit/client/data/EditList.java
@@ -14,7 +14,7 @@ package com.google.gerrit.client.data; -import org.spearce.jgit.diff.Edit; +import org.eclipse.jgit.diff.Edit; import java.util.Iterator; import java.util.List;
diff --git a/src/main/java/com/google/gerrit/client/data/PatchScript.java b/src/main/java/com/google/gerrit/client/data/PatchScript.java index f3d6d37..446d966 100644 --- a/src/main/java/com/google/gerrit/client/data/PatchScript.java +++ b/src/main/java/com/google/gerrit/client/data/PatchScript.java
@@ -19,7 +19,7 @@ import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; import com.google.gerrit.client.reviewdb.Change; -import org.spearce.jgit.diff.Edit; +import org.eclipse.jgit.diff.Edit; import java.util.List;
diff --git a/src/main/java/com/google/gerrit/git/CodeReviewCommit.java b/src/main/java/com/google/gerrit/git/CodeReviewCommit.java index a9885f4..0b67e43 100644 --- a/src/main/java/com/google/gerrit/git/CodeReviewCommit.java +++ b/src/main/java/com/google/gerrit/git/CodeReviewCommit.java
@@ -17,9 +17,9 @@ import com.google.gerrit.client.reviewdb.Change; import com.google.gerrit.client.reviewdb.PatchSet; -import org.spearce.jgit.lib.AnyObjectId; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.revwalk.RevCommit; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.revwalk.RevCommit; import java.util.List;
diff --git a/src/main/java/com/google/gerrit/git/GitRepositoryManager.java b/src/main/java/com/google/gerrit/git/GitRepositoryManager.java index ddd5c35..a278501 100644 --- a/src/main/java/com/google/gerrit/git/GitRepositoryManager.java +++ b/src/main/java/com/google/gerrit/git/GitRepositoryManager.java
@@ -21,13 +21,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.Config; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.LockFile; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.lib.RepositoryCache; -import org.spearce.jgit.lib.RepositoryCache.FileKey; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.LockFile; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.RepositoryCache; +import org.eclipse.jgit.lib.RepositoryCache.FileKey; import java.io.File; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/git/MergeOp.java b/src/main/java/com/google/gerrit/git/MergeOp.java index 1b9b49d..d2675d7 100644 --- a/src/main/java/com/google/gerrit/git/MergeOp.java +++ b/src/main/java/com/google/gerrit/git/MergeOp.java
@@ -52,26 +52,26 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.IncorrectObjectTypeException; -import org.spearce.jgit.errors.MissingObjectException; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.AnyObjectId; -import org.spearce.jgit.lib.Commit; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.PersonIdent; -import org.spearce.jgit.lib.Ref; -import org.spearce.jgit.lib.RefUpdate; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.merge.MergeStrategy; -import org.spearce.jgit.merge.Merger; -import org.spearce.jgit.merge.ThreeWayMerger; -import org.spearce.jgit.revwalk.FooterKey; -import org.spearce.jgit.revwalk.FooterLine; -import org.spearce.jgit.revwalk.RevCommit; -import org.spearce.jgit.revwalk.RevFlag; -import org.spearce.jgit.revwalk.RevSort; -import org.spearce.jgit.revwalk.RevWalk; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.Commit; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.merge.MergeStrategy; +import org.eclipse.jgit.merge.Merger; +import org.eclipse.jgit.merge.ThreeWayMerger; +import org.eclipse.jgit.revwalk.FooterKey; +import org.eclipse.jgit.revwalk.FooterLine; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevFlag; +import org.eclipse.jgit.revwalk.RevSort; +import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; import java.util.ArrayList;
diff --git a/src/main/java/com/google/gerrit/git/MergeSorter.java b/src/main/java/com/google/gerrit/git/MergeSorter.java index 57280ff..c4dedab 100644 --- a/src/main/java/com/google/gerrit/git/MergeSorter.java +++ b/src/main/java/com/google/gerrit/git/MergeSorter.java
@@ -14,10 +14,10 @@ package com.google.gerrit.git; -import org.spearce.jgit.revwalk.RevCommit; -import org.spearce.jgit.revwalk.RevCommitList; -import org.spearce.jgit.revwalk.RevFlag; -import org.spearce.jgit.revwalk.RevWalk; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevCommitList; +import org.eclipse.jgit.revwalk.RevFlag; +import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; import java.util.ArrayList;
diff --git a/src/main/java/com/google/gerrit/git/PatchSetImporter.java b/src/main/java/com/google/gerrit/git/PatchSetImporter.java index 8eb76b0..f933633 100644 --- a/src/main/java/com/google/gerrit/git/PatchSetImporter.java +++ b/src/main/java/com/google/gerrit/git/PatchSetImporter.java
@@ -25,8 +25,8 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import org.spearce.jgit.lib.Commit; -import org.spearce.jgit.revwalk.RevCommit; +import org.eclipse.jgit.lib.Commit; +import org.eclipse.jgit.revwalk.RevCommit; import java.util.ArrayList; import java.util.Collections;
diff --git a/src/main/java/com/google/gerrit/git/PushOp.java b/src/main/java/com/google/gerrit/git/PushOp.java index 67d6883..5555550 100644 --- a/src/main/java/com/google/gerrit/git/PushOp.java +++ b/src/main/java/com/google/gerrit/git/PushOp.java
@@ -20,21 +20,21 @@ import com.jcraft.jsch.JSchException; import org.slf4j.Logger; -import org.spearce.jgit.errors.NoRemoteRepositoryException; -import org.spearce.jgit.errors.NotSupportedException; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.errors.TransportException; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.NullProgressMonitor; -import org.spearce.jgit.lib.Ref; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.transport.FetchConnection; -import org.spearce.jgit.transport.PushResult; -import org.spearce.jgit.transport.RefSpec; -import org.spearce.jgit.transport.RemoteConfig; -import org.spearce.jgit.transport.RemoteRefUpdate; -import org.spearce.jgit.transport.Transport; -import org.spearce.jgit.transport.URIish; +import org.eclipse.jgit.errors.NoRemoteRepositoryException; +import org.eclipse.jgit.errors.NotSupportedException; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.errors.TransportException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.transport.FetchConnection; +import org.eclipse.jgit.transport.PushResult; +import org.eclipse.jgit.transport.RefSpec; +import org.eclipse.jgit.transport.RemoteConfig; +import org.eclipse.jgit.transport.RemoteRefUpdate; +import org.eclipse.jgit.transport.Transport; +import org.eclipse.jgit.transport.URIish; import java.io.IOException; import java.util.ArrayList;
diff --git a/src/main/java/com/google/gerrit/git/PushReplication.java b/src/main/java/com/google/gerrit/git/PushReplication.java index 77752be..999c851 100644 --- a/src/main/java/com/google/gerrit/git/PushReplication.java +++ b/src/main/java/com/google/gerrit/git/PushReplication.java
@@ -29,16 +29,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.ConfigInvalidException; -import org.spearce.jgit.lib.Config; -import org.spearce.jgit.lib.FileBasedConfig; -import org.spearce.jgit.transport.OpenSshConfig; -import org.spearce.jgit.transport.RefSpec; -import org.spearce.jgit.transport.RemoteConfig; -import org.spearce.jgit.transport.SshConfigSessionFactory; -import org.spearce.jgit.transport.SshSessionFactory; -import org.spearce.jgit.transport.URIish; -import org.spearce.jgit.util.QuotedString; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.FileBasedConfig; +import org.eclipse.jgit.transport.OpenSshConfig; +import org.eclipse.jgit.transport.RefSpec; +import org.eclipse.jgit.transport.RemoteConfig; +import org.eclipse.jgit.transport.SshConfigSessionFactory; +import org.eclipse.jgit.transport.SshSessionFactory; +import org.eclipse.jgit.transport.URIish; +import org.eclipse.jgit.util.QuotedString; import java.io.File; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/pgm/CmdLineParser.java b/src/main/java/com/google/gerrit/pgm/CmdLineParser.java index 686f417..70d14a2 100644 --- a/src/main/java/com/google/gerrit/pgm/CmdLineParser.java +++ b/src/main/java/com/google/gerrit/pgm/CmdLineParser.java
@@ -1,7 +1,7 @@ /* * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> * - * (Taken from JGit org.spearce.jgit.pgm.opt.CmdLineParser.) + * (Taken from JGit org.eclipse.jgit.pgm.opt.CmdLineParser.) * * All rights reserved. *
diff --git a/src/main/java/com/google/gerrit/server/ChangeUtil.java b/src/main/java/com/google/gerrit/server/ChangeUtil.java index 18fdd75..8fe9bb9 100644 --- a/src/main/java/com/google/gerrit/server/ChangeUtil.java +++ b/src/main/java/com/google/gerrit/server/ChangeUtil.java
@@ -18,8 +18,8 @@ import com.google.gerrit.client.reviewdb.ReviewDb; import com.google.gwtorm.client.OrmException; -import org.spearce.jgit.util.Base64; -import org.spearce.jgit.util.NB; +import org.eclipse.jgit.util.Base64; +import org.eclipse.jgit.util.NB; public class ChangeUtil { private static int uuidPrefix;
diff --git a/src/main/java/com/google/gerrit/server/GerritPersonIdent.java b/src/main/java/com/google/gerrit/server/GerritPersonIdent.java index 24440fd..07b49ee 100644 --- a/src/main/java/com/google/gerrit/server/GerritPersonIdent.java +++ b/src/main/java/com/google/gerrit/server/GerritPersonIdent.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention; /** - * Marker on a {@link org.spearce.jgit.lib.PersonIdent} pointing to the identity representing Gerrit + * Marker on a {@link org.eclipse.jgit.lib.PersonIdent} pointing to the identity representing Gerrit * server itself. */ @Retention(RUNTIME)
diff --git a/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java b/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java index 2d78b4a..2d9bbb9 100644 --- a/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java +++ b/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java
@@ -19,9 +19,9 @@ import com.google.inject.Provider; import com.google.inject.Singleton; -import org.spearce.jgit.lib.Config; -import org.spearce.jgit.lib.PersonIdent; -import org.spearce.jgit.lib.UserConfig; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.UserConfig; /** Provides {@link PersonIdent} annotated with {@link GerritPersonIdent}. */ @Singleton
diff --git a/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/src/main/java/com/google/gerrit/server/IdentifiedUser.java index 7a87af2..52d93cf 100644 --- a/src/main/java/com/google/gerrit/server/IdentifiedUser.java +++ b/src/main/java/com/google/gerrit/server/IdentifiedUser.java
@@ -33,7 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.PersonIdent; import java.net.InetAddress; import java.net.InetSocketAddress;
diff --git a/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java b/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java index cefd0d8..7062d95 100644 --- a/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java +++ b/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java
@@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.security.AccessController; import java.security.PrivilegedAction;
diff --git a/src/main/java/com/google/gerrit/server/cache/CachePool.java b/src/main/java/com/google/gerrit/server/cache/CachePool.java index c3b514a..cee1028 100644 --- a/src/main/java/com/google/gerrit/server/cache/CachePool.java +++ b/src/main/java/com/google/gerrit/server/cache/CachePool.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.io.File; import java.util.HashMap;
diff --git a/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/src/main/java/com/google/gerrit/server/config/AuthConfig.java index 6757204..0756c64 100644 --- a/src/main/java/com/google/gerrit/server/config/AuthConfig.java +++ b/src/main/java/com/google/gerrit/server/config/AuthConfig.java
@@ -23,7 +23,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.util.Collection; import java.util.Collections;
diff --git a/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java b/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java index 97162eb..3cce4f0 100644 --- a/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java +++ b/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java
@@ -17,7 +17,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; /** Provides {@link CanonicalWebUrl} from {@code gerrit.canonicalWebUrl}. */ public class CanonicalWebUrlProvider implements Provider<String> {
diff --git a/src/main/java/com/google/gerrit/server/config/ConfigUtil.java b/src/main/java/com/google/gerrit/server/config/ConfigUtil.java index 33a828d..b507474 100644 --- a/src/main/java/com/google/gerrit/server/config/ConfigUtil.java +++ b/src/main/java/com/google/gerrit/server/config/ConfigUtil.java
@@ -14,9 +14,9 @@ package com.google.gerrit.server.config; -import static org.spearce.jgit.util.StringUtils.equalsIgnoreCase; +import static org.eclipse.jgit.util.StringUtils.equalsIgnoreCase; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.lang.reflect.InvocationTargetException; import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java b/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java index e9d445f..a55ef84d 100644 --- a/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java +++ b/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java
@@ -19,7 +19,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; class EmailExpanderProvider implements Provider<EmailExpander> { private final EmailExpander expander;
diff --git a/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java b/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java index efc7c69..43a0944 100644 --- a/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java +++ b/src/main/java/com/google/gerrit/server/config/GerritConfigModule.java
@@ -19,7 +19,7 @@ import com.google.gerrit.client.reviewdb.Project; import com.google.inject.AbstractModule; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.io.File;
diff --git a/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java index e137b20..272a705 100644 --- a/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java +++ b/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -66,8 +66,8 @@ import com.google.inject.Module; import com.google.inject.Provider; -import org.spearce.jgit.lib.Config; -import org.spearce.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.PersonIdent; import java.util.ArrayList; import java.util.List;
diff --git a/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java b/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java index 540fc73..0dc1e68 100644 --- a/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java +++ b/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java
@@ -21,7 +21,7 @@ import java.lang.annotation.Retention; /** - * Marker on {@link org.spearce.jgit.lib.Config} holding {@code gerrit.config} . + * Marker on {@link org.eclipse.jgit.lib.Config} holding {@code gerrit.config} . * <p> * The {@code gerrit.config} file contains almost all site-wide configuration * settings for the Gerrit Code Review server.
diff --git a/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java b/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java index 2cc64ab..a7d134d 100644 --- a/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java +++ b/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java
@@ -20,11 +20,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.ConfigInvalidException; -import org.spearce.jgit.lib.Config; -import org.spearce.jgit.lib.FileBasedConfig; -import org.spearce.jgit.lib.WindowCache; -import org.spearce.jgit.lib.WindowCacheConfig; +import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.FileBasedConfig; +import org.eclipse.jgit.lib.WindowCache; +import org.eclipse.jgit.lib.WindowCacheConfig; import java.io.File; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java b/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java index 5011496..977d860 100644 --- a/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java +++ b/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java
@@ -23,7 +23,7 @@ import com.google.inject.ProvisionException; import org.bouncycastle.openpgp.PGPPublicKey; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.io.File; import java.net.MalformedURLException;
diff --git a/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java b/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java index a5b6469..74a533e 100644 --- a/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java +++ b/src/main/java/com/google/gerrit/server/contact/EncryptedContactStore.java
@@ -39,7 +39,7 @@ import org.bouncycastle.openpgp.PGPUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.util.NB; +import org.eclipse.jgit.util.NB; import java.io.ByteArrayOutputStream; import java.io.File;
diff --git a/src/main/java/com/google/gerrit/server/http/CatServlet.java b/src/main/java/com/google/gerrit/server/http/CatServlet.java index a4ec406..01b3590 100644 --- a/src/main/java/com/google/gerrit/server/http/CatServlet.java +++ b/src/main/java/com/google/gerrit/server/http/CatServlet.java
@@ -30,14 +30,14 @@ import eu.medsea.mimeutil.MimeType; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.revwalk.RevCommit; -import org.spearce.jgit.revwalk.RevWalk; -import org.spearce.jgit.treewalk.TreeWalk; -import org.spearce.jgit.util.NB; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.treewalk.TreeWalk; +import org.eclipse.jgit.util.NB; import java.io.ByteArrayOutputStream; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/http/GerritConfigProvider.java b/src/main/java/com/google/gerrit/server/http/GerritConfigProvider.java index b91302e..327eb8e 100644 --- a/src/main/java/com/google/gerrit/server/http/GerritConfigProvider.java +++ b/src/main/java/com/google/gerrit/server/http/GerritConfigProvider.java
@@ -31,7 +31,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.util.HashSet; import java.util.Set;
diff --git a/src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java b/src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java index dc28e5e..c61bdf5 100644 --- a/src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java +++ b/src/main/java/com/google/gerrit/server/http/GerritJsonServlet.java
@@ -51,8 +51,8 @@ protected GsonBuilder createGsonBuilder() { final GsonBuilder g = super.createGsonBuilder(); - g.registerTypeAdapter(org.spearce.jgit.diff.Edit.class, - new org.spearce.jgit.diff.EditDeserializer()); + g.registerTypeAdapter(org.eclipse.jgit.diff.Edit.class, + new org.eclipse.jgit.diff.EditDeserializer()); return g; }
diff --git a/src/main/java/com/google/gerrit/server/http/HostPageServlet.java b/src/main/java/com/google/gerrit/server/http/HostPageServlet.java index 524ba63..e8149b6 100644 --- a/src/main/java/com/google/gerrit/server/http/HostPageServlet.java +++ b/src/main/java/com/google/gerrit/server/http/HostPageServlet.java
@@ -27,8 +27,8 @@ import com.google.inject.Provider; import com.google.inject.Singleton; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; import org.w3c.dom.Document; import org.w3c.dom.Element;
diff --git a/src/main/java/com/google/gerrit/server/http/HttpCanonicalWebUrlProvider.java b/src/main/java/com/google/gerrit/server/http/HttpCanonicalWebUrlProvider.java index 8c1f352..013da83 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpCanonicalWebUrlProvider.java +++ b/src/main/java/com/google/gerrit/server/http/HttpCanonicalWebUrlProvider.java
@@ -22,7 +22,7 @@ import com.google.inject.Provider; import com.google.inject.ProvisionException; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java b/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java index 480931d..665ff3f 100644 --- a/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java +++ b/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.util.Base64; +import org.eclipse.jgit.util.Base64; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/http/StaticServlet.java b/src/main/java/com/google/gerrit/server/http/StaticServlet.java index 9a52863..a075c5e 100644 --- a/src/main/java/com/google/gerrit/server/http/StaticServlet.java +++ b/src/main/java/com/google/gerrit/server/http/StaticServlet.java
@@ -19,7 +19,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -import org.spearce.jgit.util.NB; +import org.eclipse.jgit.util.NB; import java.io.ByteArrayOutputStream; import java.io.File;
diff --git a/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java b/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java index b3d1a39..a2d0887 100644 --- a/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java +++ b/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java
@@ -31,7 +31,7 @@ import com.google.gerrit.client.rpc.CodedEnum; -import org.spearce.jgit.util.NB; +import org.eclipse.jgit.util.NB; import java.io.EOFException; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/ldap/LdapRealm.java b/src/main/java/com/google/gerrit/server/ldap/LdapRealm.java index 5f66f0b..3c0b0d7 100644 --- a/src/main/java/com/google/gerrit/server/ldap/LdapRealm.java +++ b/src/main/java/com/google/gerrit/server/ldap/LdapRealm.java
@@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.util.ArrayList; import java.util.Arrays;
diff --git a/src/main/java/com/google/gerrit/server/mail/CommentSender.java b/src/main/java/com/google/gerrit/server/mail/CommentSender.java index 080ecd7..7f52fac 100644 --- a/src/main/java/com/google/gerrit/server/mail/CommentSender.java +++ b/src/main/java/com/google/gerrit/server/mail/CommentSender.java
@@ -22,8 +22,8 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.Repository; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Repository; import java.io.IOException; import java.util.Collections;
diff --git a/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java index 7ebc845..f9322d4 100644 --- a/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java +++ b/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java
@@ -23,8 +23,8 @@ import com.google.inject.Provider; import com.google.inject.Singleton; -import org.spearce.jgit.lib.Config; -import org.spearce.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.PersonIdent; /** Creates a {@link FromAddressGenerator} from the {@link GerritServerConfig} */ @Singleton
diff --git a/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java b/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java index f902ed9..f54084f 100644 --- a/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java +++ b/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
@@ -41,7 +41,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -import org.spearce.jgit.util.SystemReader; +import org.eclipse.jgit.util.SystemReader; import java.net.MalformedURLException; import java.net.URL;
diff --git a/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java index ae0de93..d22cc59 100644 --- a/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java +++ b/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
@@ -19,7 +19,7 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import org.spearce.jgit.util.Base64; +import org.eclipse.jgit.util.Base64; import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java b/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java index c0f8439..7fab210 100644 --- a/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java +++ b/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java
@@ -22,7 +22,7 @@ import org.apache.commons.net.smtp.AuthSMTPClient; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPReply; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.io.BufferedWriter; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchFile.java b/src/main/java/com/google/gerrit/server/patch/PatchFile.java index df857a0..6bda2cc 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchFile.java +++ b/src/main/java/com/google/gerrit/server/patch/PatchFile.java
@@ -18,17 +18,17 @@ import com.google.gerrit.client.rpc.CorruptEntityException; import com.google.gerrit.client.rpc.NoSuchEntityException; -import org.spearce.jgit.errors.CorruptObjectException; -import org.spearce.jgit.errors.IncorrectObjectTypeException; -import org.spearce.jgit.errors.MissingObjectException; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.ObjectLoader; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.revwalk.RevCommit; -import org.spearce.jgit.revwalk.RevTree; -import org.spearce.jgit.revwalk.RevWalk; -import org.spearce.jgit.treewalk.TreeWalk; +import org.eclipse.jgit.errors.CorruptObjectException; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectLoader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevTree; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.treewalk.TreeWalk; import java.io.IOException; import java.nio.charset.CharacterCodingException;
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchList.java b/src/main/java/com/google/gerrit/server/patch/PatchList.java index 69908a4..a1a3137 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchList.java +++ b/src/main/java/com/google/gerrit/server/patch/PatchList.java
@@ -19,17 +19,17 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.readVarInt32; import static com.google.gerrit.server.ioutil.BasicSerialization.writeBytes; import static com.google.gerrit.server.ioutil.BasicSerialization.writeVarInt32; -import static org.spearce.jgit.lib.ObjectIdSerialization.readCanBeNull; -import static org.spearce.jgit.lib.ObjectIdSerialization.readNotNull; -import static org.spearce.jgit.lib.ObjectIdSerialization.writeCanBeNull; -import static org.spearce.jgit.lib.ObjectIdSerialization.writeNotNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.readCanBeNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.readNotNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.writeCanBeNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull; import com.google.gerrit.client.reviewdb.Patch; import com.google.gerrit.client.reviewdb.PatchSet; import com.google.gerrit.server.config.Nullable; -import org.spearce.jgit.lib.AnyObjectId; -import org.spearce.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ObjectId; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java index df52d82..bf55c15 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java +++ b/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
@@ -31,14 +31,14 @@ import com.google.inject.TypeLiteral; import com.google.inject.name.Named; -import org.spearce.jgit.errors.IncorrectObjectTypeException; -import org.spearce.jgit.errors.MissingObjectException; -import org.spearce.jgit.lib.AnyObjectId; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.ObjectWriter; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.revwalk.RevCommit; -import org.spearce.jgit.revwalk.RevWalk; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectWriter; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; import java.io.InputStream; @@ -141,7 +141,7 @@ args.add(b.name()); } - final org.spearce.jgit.patch.Patch p = new org.spearce.jgit.patch.Patch(); + final org.eclipse.jgit.patch.Patch p = new org.eclipse.jgit.patch.Patch(); final Process diffProcess = exec(repo, args); try { diffProcess.getOutputStream().close();
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java b/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java index 7328f55..a17fc98 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java +++ b/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java
@@ -28,13 +28,13 @@ import com.google.gerrit.client.reviewdb.Patch.ChangeType; import com.google.gerrit.client.reviewdb.Patch.PatchType; -import org.spearce.jgit.diff.Edit; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.FileMode; -import org.spearce.jgit.patch.CombinedFileHeader; -import org.spearce.jgit.patch.FileHeader; -import org.spearce.jgit.util.IntList; -import org.spearce.jgit.util.RawParseUtils; +import org.eclipse.jgit.diff.Edit; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.patch.CombinedFileHeader; +import org.eclipse.jgit.patch.FileHeader; +import org.eclipse.jgit.util.IntList; +import org.eclipse.jgit.util.RawParseUtils; import java.io.IOException; import java.io.InputStream;
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchListKey.java b/src/main/java/com/google/gerrit/server/patch/PatchListKey.java index 8834fd2..a04139a 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchListKey.java +++ b/src/main/java/com/google/gerrit/server/patch/PatchListKey.java
@@ -16,17 +16,17 @@ import static com.google.gerrit.server.ioutil.BasicSerialization.readEnum; import static com.google.gerrit.server.ioutil.BasicSerialization.writeEnum; -import static org.spearce.jgit.lib.ObjectIdSerialization.readCanBeNull; -import static org.spearce.jgit.lib.ObjectIdSerialization.readNotNull; -import static org.spearce.jgit.lib.ObjectIdSerialization.writeCanBeNull; -import static org.spearce.jgit.lib.ObjectIdSerialization.writeNotNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.readCanBeNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.readNotNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.writeCanBeNull; +import static org.eclipse.jgit.lib.ObjectIdSerialization.writeNotNull; import com.google.gerrit.client.data.PatchScriptSettings.Whitespace; import com.google.gerrit.client.reviewdb.Project; import com.google.gerrit.server.config.Nullable; -import org.spearce.jgit.lib.AnyObjectId; -import org.spearce.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ObjectId; import java.io.IOException; import java.io.ObjectInputStream;
diff --git a/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java b/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java index cb1e96b..81c1051 100644 --- a/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java +++ b/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
@@ -28,11 +28,11 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.PersonIdent; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.revwalk.RevCommit; -import org.spearce.jgit.revwalk.RevWalk; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; import java.sql.Timestamp;
diff --git a/src/main/java/com/google/gerrit/server/patch/Text.java b/src/main/java/com/google/gerrit/server/patch/Text.java index b77e023..c5c3ecb 100644 --- a/src/main/java/com/google/gerrit/server/patch/Text.java +++ b/src/main/java/com/google/gerrit/server/patch/Text.java
@@ -16,9 +16,9 @@ import com.google.gerrit.client.data.SparseFileContent; -import org.spearce.jgit.diff.RawText; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.util.RawParseUtils; +import org.eclipse.jgit.diff.RawText; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.util.RawParseUtils; public class Text extends RawText { public static final Text EMPTY = new Text(new byte[0]);
diff --git a/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/src/main/java/com/google/gerrit/server/project/ProjectControl.java index 679104e..dcd55b7 100644 --- a/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/src/main/java/com/google/gerrit/server/project/ProjectControl.java
@@ -28,7 +28,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -import org.spearce.jgit.lib.Constants; +import org.eclipse.jgit.lib.Constants; import java.util.Set;
diff --git a/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java b/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java index 4bd20ad..2b4a6b9 100644 --- a/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java +++ b/src/main/java/com/google/gerrit/server/query/ChangeQueryBuilder.java
@@ -17,7 +17,7 @@ import com.google.gerrit.client.reviewdb.RevId; import com.google.inject.Singleton; -import org.spearce.jgit.lib.AbbreviatedObjectId; +import org.eclipse.jgit.lib.AbbreviatedObjectId; /** * Parses a query string meant to be applied to change objects.
diff --git a/src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java b/src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java index 2da042c..bd9eeea 100644 --- a/src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java +++ b/src/main/java/com/google/gerrit/server/query/ObjectIdPredicate.java
@@ -14,8 +14,8 @@ package com.google.gerrit.server.query; -import org.spearce.jgit.lib.AbbreviatedObjectId; -import org.spearce.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.AbbreviatedObjectId; +import org.eclipse.jgit.lib.ObjectId; /** Predicate for a field of {@link ObjectId}. */
diff --git a/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java b/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java index 476474e..fed89b9 100644 --- a/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java +++ b/src/main/java/com/google/gerrit/server/rpc/account/AccountSecurityImpl.java
@@ -53,7 +53,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.util.Base64; +import org.eclipse.jgit.util.Base64; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException;
diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptBuilder.java b/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptBuilder.java index 6a1f5d0..6ddc846 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptBuilder.java +++ b/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptBuilder.java
@@ -30,18 +30,18 @@ import eu.medsea.mimeutil.MimeType; import eu.medsea.mimeutil.MimeUtil2; -import org.spearce.jgit.diff.Edit; -import org.spearce.jgit.errors.CorruptObjectException; -import org.spearce.jgit.errors.IncorrectObjectTypeException; -import org.spearce.jgit.errors.MissingObjectException; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.FileMode; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.ObjectLoader; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.revwalk.RevTree; -import org.spearce.jgit.revwalk.RevWalk; -import org.spearce.jgit.treewalk.TreeWalk; +import org.eclipse.jgit.diff.Edit; +import org.eclipse.jgit.errors.CorruptObjectException; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectLoader; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevTree; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.treewalk.TreeWalk; import java.io.IOException; import java.util.ArrayList;
diff --git a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptFactory.java b/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptFactory.java index 0924f12..1b947b5 100644 --- a/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptFactory.java +++ b/src/main/java/com/google/gerrit/server/rpc/patch/PatchScriptFactory.java
@@ -42,9 +42,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.Repository; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/rpc/project/AddBranch.java b/src/main/java/com/google/gerrit/server/rpc/project/AddBranch.java index 6d42388..08f185c 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/AddBranch.java +++ b/src/main/java/com/google/gerrit/server/rpc/project/AddBranch.java
@@ -31,15 +31,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.IncorrectObjectTypeException; -import org.spearce.jgit.errors.MissingObjectException; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.Ref; -import org.spearce.jgit.lib.RefUpdate; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.revwalk.ObjectWalk; -import org.spearce.jgit.revwalk.RevWalk; +import org.eclipse.jgit.errors.IncorrectObjectTypeException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.ObjectWalk; +import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; import java.util.Collections;
diff --git a/src/main/java/com/google/gerrit/server/rpc/project/DeleteBranches.java b/src/main/java/com/google/gerrit/server/rpc/project/DeleteBranches.java index 9eb5f06..0c77034 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/DeleteBranches.java +++ b/src/main/java/com/google/gerrit/server/rpc/project/DeleteBranches.java
@@ -28,9 +28,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.RefUpdate; -import org.spearce.jgit.lib.Repository; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.lib.Repository; import java.io.IOException; import java.util.Collections;
diff --git a/src/main/java/com/google/gerrit/server/rpc/project/ListBranches.java b/src/main/java/com/google/gerrit/server/rpc/project/ListBranches.java index 2197db6..0b16b1d 100644 --- a/src/main/java/com/google/gerrit/server/rpc/project/ListBranches.java +++ b/src/main/java/com/google/gerrit/server/rpc/project/ListBranches.java
@@ -23,10 +23,10 @@ import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.Ref; -import org.spearce.jgit.lib.Repository; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.Repository; import java.util.ArrayList; import java.util.Collections;
diff --git a/src/main/java/com/google/gerrit/server/ssh/NoShell.java b/src/main/java/com/google/gerrit/server/ssh/NoShell.java index b4eb39c..b2bf8ce 100644 --- a/src/main/java/com/google/gerrit/server/ssh/NoShell.java +++ b/src/main/java/com/google/gerrit/server/ssh/NoShell.java
@@ -17,7 +17,7 @@ import com.google.gerrit.server.http.SshServlet; import org.apache.sshd.server.ShellFactory; -import org.spearce.jgit.lib.Constants; +import org.eclipse.jgit.lib.Constants; import java.io.IOException; import java.io.InputStream;
diff --git a/src/main/java/com/google/gerrit/server/ssh/SshDaemon.java b/src/main/java/com/google/gerrit/server/ssh/SshDaemon.java index f07c18c2..0e474d9 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshDaemon.java +++ b/src/main/java/com/google/gerrit/server/ssh/SshDaemon.java
@@ -60,7 +60,7 @@ import org.apache.sshd.server.session.ServerSession; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.lib.Config; +import org.eclipse.jgit.lib.Config; import java.io.IOException; import java.net.Inet6Address;
diff --git a/src/main/java/com/google/gerrit/server/ssh/SshUtil.java b/src/main/java/com/google/gerrit/server/ssh/SshUtil.java index 97c9abc..78bea6c 100644 --- a/src/main/java/com/google/gerrit/server/ssh/SshUtil.java +++ b/src/main/java/com/google/gerrit/server/ssh/SshUtil.java
@@ -22,7 +22,7 @@ import org.apache.sshd.common.session.AttributeKey; import org.apache.sshd.common.util.Buffer; import org.apache.sshd.server.CommandFactory.Command; -import org.spearce.jgit.lib.Constants; +import org.eclipse.jgit.lib.Constants; import java.io.BufferedReader; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AbstractGitCommand.java b/src/main/java/com/google/gerrit/server/ssh/commands/AbstractGitCommand.java index 1a3848f..9a02e94 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AbstractGitCommand.java +++ b/src/main/java/com/google/gerrit/server/ssh/commands/AbstractGitCommand.java
@@ -21,8 +21,8 @@ import com.google.inject.Inject; import org.kohsuke.args4j.Argument; -import org.spearce.jgit.errors.RepositoryNotFoundException; -import org.spearce.jgit.lib.Repository; +import org.eclipse.jgit.errors.RepositoryNotFoundException; +import org.eclipse.jgit.lib.Repository; import java.io.IOException;
diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminCreateProject.java b/src/main/java/com/google/gerrit/server/ssh/commands/AdminCreateProject.java index c527536..91143f1 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminCreateProject.java +++ b/src/main/java/com/google/gerrit/server/ssh/commands/AdminCreateProject.java
@@ -31,8 +31,8 @@ import com.google.inject.Inject; import org.kohsuke.args4j.Option; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.Repository; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.Repository; import java.io.PrintWriter; import java.util.Collections;
diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java b/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java index 116e64c..1f2a6bd 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java +++ b/src/main/java/com/google/gerrit/server/ssh/commands/AdminShowCaches.java
@@ -20,7 +20,7 @@ import net.sf.ehcache.Statistics; import net.sf.ehcache.config.CacheConfiguration; -import org.spearce.jgit.lib.WindowCacheStatAccessor; +import org.eclipse.jgit.lib.WindowCacheStatAccessor; import java.io.PrintWriter;
diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java b/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java index db6b741..f66e6de 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java +++ b/src/main/java/com/google/gerrit/server/ssh/commands/Receive.java
@@ -60,27 +60,27 @@ import org.kohsuke.args4j.Option; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.errors.MissingObjectException; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.PersonIdent; -import org.spearce.jgit.lib.Ref; -import org.spearce.jgit.lib.RefUpdate; -import org.spearce.jgit.revwalk.FooterKey; -import org.spearce.jgit.revwalk.FooterLine; -import org.spearce.jgit.revwalk.RevCommit; -import org.spearce.jgit.revwalk.RevFlag; -import org.spearce.jgit.revwalk.RevFlagSet; -import org.spearce.jgit.revwalk.RevObject; -import org.spearce.jgit.revwalk.RevSort; -import org.spearce.jgit.revwalk.RevTag; -import org.spearce.jgit.revwalk.RevWalk; -import org.spearce.jgit.transport.PostReceiveHook; -import org.spearce.jgit.transport.PreReceiveHook; -import org.spearce.jgit.transport.ReceiveCommand; -import org.spearce.jgit.transport.ReceivePack; -import org.spearce.jgit.transport.ReceiveCommand.Result; -import org.spearce.jgit.transport.ReceiveCommand.Type; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.revwalk.FooterKey; +import org.eclipse.jgit.revwalk.FooterLine; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevFlag; +import org.eclipse.jgit.revwalk.RevFlagSet; +import org.eclipse.jgit.revwalk.RevObject; +import org.eclipse.jgit.revwalk.RevSort; +import org.eclipse.jgit.revwalk.RevTag; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.transport.PostReceiveHook; +import org.eclipse.jgit.transport.PreReceiveHook; +import org.eclipse.jgit.transport.ReceiveCommand; +import org.eclipse.jgit.transport.ReceivePack; +import org.eclipse.jgit.transport.ReceiveCommand.Result; +import org.eclipse.jgit.transport.ReceiveCommand.Type; import java.io.IOException; import java.io.PrintWriter;
diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/ScpCommand.java b/src/main/java/com/google/gerrit/server/ssh/commands/ScpCommand.java index fad57de..c31ea42 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/ScpCommand.java +++ b/src/main/java/com/google/gerrit/server/ssh/commands/ScpCommand.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.util.RawParseUtils; +import org.eclipse.jgit.util.RawParseUtils; import java.io.BufferedReader; import java.io.ByteArrayInputStream;
diff --git a/src/main/java/com/google/gerrit/server/ssh/commands/Upload.java b/src/main/java/com/google/gerrit/server/ssh/commands/Upload.java index ab4d89e..6e03829 100644 --- a/src/main/java/com/google/gerrit/server/ssh/commands/Upload.java +++ b/src/main/java/com/google/gerrit/server/ssh/commands/Upload.java
@@ -14,7 +14,7 @@ package com.google.gerrit.server.ssh.commands; -import org.spearce.jgit.transport.UploadPack; +import org.eclipse.jgit.transport.UploadPack; import java.io.IOException;
diff --git a/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java b/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java index 9d70823..3dbf9c3 100644 --- a/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java +++ b/src/main/java/org/apache/commons/net/smtp/AuthSMTPClient.java
@@ -16,7 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.spearce.jgit.util.Base64; +import org.eclipse.jgit.util.Base64; import java.io.IOException; import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/org/spearce/jgit/JGit.gwt.xml b/src/main/java/org/eclipse/jgit/JGit.gwt.xml similarity index 100% rename from src/main/java/org/spearce/jgit/JGit.gwt.xml rename to src/main/java/org/eclipse/jgit/JGit.gwt.xml
diff --git a/src/main/java/org/spearce/jgit/diff/EditDeserializer.java b/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java similarity index 98% rename from src/main/java/org/spearce/jgit/diff/EditDeserializer.java rename to src/main/java/org/eclipse/jgit/diff/EditDeserializer.java index 927db3c..b3eb9e0 100644 --- a/src/main/java/org/spearce/jgit/diff/EditDeserializer.java +++ b/src/main/java/org/eclipse/jgit/diff/EditDeserializer.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.spearce.jgit.diff; +package org.eclipse.jgit.diff; import com.google.gson.JsonArray; import com.google.gson.JsonDeserializationContext;
diff --git a/src/main/java/org/spearce/jgit/diff/Edit_JsonSerializer.java b/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java similarity index 97% rename from src/main/java/org/spearce/jgit/diff/Edit_JsonSerializer.java rename to src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java index 27db655..1b138fb 100644 --- a/src/main/java/org/spearce/jgit/diff/Edit_JsonSerializer.java +++ b/src/main/java/org/eclipse/jgit/diff/Edit_JsonSerializer.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.spearce.jgit.diff; +package org.eclipse.jgit.diff; import com.google.gwt.core.client.JavaScriptObject; import com.google.gwtjsonrpc.client.JsonSerializer;
diff --git a/src/main/java/org/spearce/jgit/lib/ObjectIdSerialization.java b/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java similarity index 98% rename from src/main/java/org/spearce/jgit/lib/ObjectIdSerialization.java rename to src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java index b8c852c..9d001c3 100644 --- a/src/main/java/org/spearce/jgit/lib/ObjectIdSerialization.java +++ b/src/main/java/org/eclipse/jgit/lib/ObjectIdSerialization.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.spearce.jgit.lib; +package org.eclipse.jgit.lib; import static com.google.gerrit.server.ioutil.BasicSerialization.readFixInt32; import static com.google.gerrit.server.ioutil.BasicSerialization.readVarInt32;
diff --git a/src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java b/src/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java similarity index 96% rename from src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java rename to src/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java index 4cd03d6..7d12e47 100644 --- a/src/main/java/org/spearce/jgit/lib/WindowCacheStatAccessor.java +++ b/src/main/java/org/eclipse/jgit/lib/WindowCacheStatAccessor.java
@@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.spearce.jgit.lib; +package org.eclipse.jgit.lib; // Hack to obtain visibility to package level methods only. // These aren't yet part of the public JGit API.
diff --git a/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java b/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java index 78bea43..81422ab 100644 --- a/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java +++ b/src/test/java/com/google/gerrit/server/mail/FromAddressGeneratorProviderTest.java
@@ -28,8 +28,8 @@ import junit.framework.TestCase; -import org.spearce.jgit.lib.Config; -import org.spearce.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.PersonIdent; import java.util.Collections;
diff --git a/src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java b/src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java index 11702cc..4dc8ba5 100644 --- a/src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java +++ b/src/test/java/com/google/gerrit/server/query/ChangeQueryBuilderTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestCase; -import org.spearce.jgit.lib.AbbreviatedObjectId; +import org.eclipse.jgit.lib.AbbreviatedObjectId; public class ChangeQueryBuilderTest extends TestCase { private static OperatorPredicate f(final String name, final String value) {
diff --git a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/CommitMsgHookTest.java b/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/CommitMsgHookTest.java index eb842d6..8c7d056 100644 --- a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/CommitMsgHookTest.java +++ b/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/CommitMsgHookTest.java
@@ -14,23 +14,39 @@ package com.google.gerrit.server.ssh.scproot.hooks; -import org.spearce.jgit.dircache.DirCache; -import org.spearce.jgit.dircache.DirCacheBuilder; -import org.spearce.jgit.dircache.DirCacheEntry; -import org.spearce.jgit.lib.Commit; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.FileMode; -import org.spearce.jgit.lib.ObjectId; -import org.spearce.jgit.lib.ObjectWriter; -import org.spearce.jgit.lib.RefUpdate; +import org.eclipse.jgit.dircache.DirCache; +import org.eclipse.jgit.dircache.DirCacheBuilder; +import org.eclipse.jgit.dircache.DirCacheEntry; +import org.eclipse.jgit.lib.Commit; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectWriter; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.RefUpdate; import java.io.File; import java.io.IOException; +import java.util.Date; +import java.util.TimeZone; public class CommitMsgHookTest extends HookTestCase { private final String SOB1 = "Signed-off-by: J Author <ja@example.com>\n"; private final String SOB2 = "Signed-off-by: J Committer <jc@example.com>\n"; + @Override + protected void setUp() throws Exception { + super.setUp(); + final Date when = author.getWhen(); + final TimeZone tz = author.getTimeZone(); + + author = new PersonIdent("J. Author", "ja@example.com"); + author = new PersonIdent(author, when, tz); + + committer = new PersonIdent("J. Committer", "jc@example.com"); + committer = new PersonIdent(committer, when, tz); + } + public void testEmptyMessages() throws Exception { // Empty input must yield empty output so commit will abort. // Note we must consider different commit templates formats.
diff --git a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/HookTestCase.java b/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/HookTestCase.java index e7480a3..a5e45f2 100644 --- a/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/HookTestCase.java +++ b/src/test/java/com/google/gerrit/server/ssh/scproot/hooks/HookTestCase.java
@@ -52,7 +52,7 @@ import com.google.gerrit.testutil.LocalDiskRepositoryTestCase; -import org.spearce.jgit.lib.Repository; +import org.eclipse.jgit.lib.Repository; import java.io.File; import java.net.URISyntaxException; @@ -64,7 +64,7 @@ @Override protected void setUp() throws Exception { super.setUp(); - repository = createRepository(false /* not bare */); + repository = createWorkRepository(); } protected File getHook(final String name) {
diff --git a/src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java b/src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java index bdca013..91879bdd 100644 --- a/src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java +++ b/src/test/java/com/google/gerrit/testutil/LocalDiskRepositoryTestCase.java
@@ -37,12 +37,12 @@ import junit.framework.TestCase; -import org.spearce.jgit.lib.FileBasedConfig; -import org.spearce.jgit.lib.PersonIdent; -import org.spearce.jgit.lib.Repository; -import org.spearce.jgit.lib.RepositoryCache; -import org.spearce.jgit.util.NB; -import org.spearce.jgit.util.SystemReader; +import org.eclipse.jgit.lib.FileBasedConfig; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.RepositoryCache; +import org.eclipse.jgit.util.NB; +import org.eclipse.jgit.util.SystemReader; import java.io.File; import java.io.FileOutputStream; @@ -169,8 +169,12 @@ System.err.println(msg); } + protected Repository createWorkRepository() throws IOException { + return createRepository(false/* not bare */); + } + /** Creates a new empty repository. */ - protected Repository createRepository(boolean bare) throws IOException { + private Repository createRepository(boolean bare) throws IOException { final String uniqueId = System.currentTimeMillis() + "_" + (testCount++); final String gitdirName = "test" + uniqueId + (bare ? "" : "/") + ".git"; final File gitdir = new File(trash, gitdirName).getCanonicalFile();
diff --git a/src/test/java/com/google/gerrit/testutil/MockSystemReader.java b/src/test/java/com/google/gerrit/testutil/MockSystemReader.java index eedd39b..48952a5 100644 --- a/src/test/java/com/google/gerrit/testutil/MockSystemReader.java +++ b/src/test/java/com/google/gerrit/testutil/MockSystemReader.java
@@ -32,9 +32,9 @@ package com.google.gerrit.testutil; -import org.spearce.jgit.lib.Constants; -import org.spearce.jgit.lib.FileBasedConfig; -import org.spearce.jgit.util.SystemReader; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.FileBasedConfig; +import org.eclipse.jgit.util.SystemReader; import java.util.HashMap; import java.util.Map;