Update JGit to 3.0 APIs

Change-Id: Ib4fc5a52c84657fa86cf2fc553f46d1776b4273c

gerrit-patch-jgit/src/main/java/org/eclipse/jgit/internal/storage/file/WindowCacheStatAccessor.java

@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.eclipse.jgit.storage.file;
+package org.eclipse.jgit.internal.storage.file;
+
+import org.eclipse.jgit.internal.storage.file.WindowCache;
 
 // Hack to obtain visibility to package level methods only.
 // These aren't yet part of the public JGit API.

gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtoGen.java

@@ -18,7 +18,7 @@ import com.google.gerrit.pgm.util.AbstractProgram;
 import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gwtorm.schema.java.JavaSchemaModel;
 
-import org.eclipse.jgit.storage.file.LockFile;
+import org.eclipse.jgit.internal.storage.file.LockFile;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.IO;
 import org.kohsuke.args4j.Option;

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java

@@ -23,7 +23,7 @@ import com.google.gerrit.server.config.SitePaths;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
-import org.eclipse.jgit.storage.file.LockFile;
+import org.eclipse.jgit.internal.storage.file.LockFile;
 import org.eclipse.jgit.util.FS;
 
 import java.io.File;

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitUtil.java

@@ -16,9 +16,9 @@ package com.google.gerrit.pgm.init;
 
 import com.google.gerrit.pgm.util.Die;
 
+import org.eclipse.jgit.internal.storage.file.LockFile;
 import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.storage.file.FileBasedConfig;
-import org.eclipse.jgit.storage.file.LockFile;
 import org.eclipse.jgit.util.FS;
 import org.eclipse.jgit.util.IO;
 import org.eclipse.jgit.util.SystemReader;

gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java

@@ -26,6 +26,7 @@ import com.google.inject.Singleton;
 import com.jcraft.jsch.Session;
 
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
+import org.eclipse.jgit.internal.storage.file.LockFile;
 import org.eclipse.jgit.lib.Config;
 import org.eclipse.jgit.lib.ConfigConstants;
 import org.eclipse.jgit.lib.Constants;
@@ -33,8 +34,6 @@ import org.eclipse.jgit.lib.Repository;
 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.LockFile;
-import org.eclipse.jgit.storage.file.WindowCache;
 import org.eclipse.jgit.storage.file.WindowCacheConfig;
 import org.eclipse.jgit.transport.JschConfigSessionFactory;
 import org.eclipse.jgit.transport.OpenSshConfig;
@@ -95,10 +94,7 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager {
           // Default configuration is batch mode.
         }
       });
-
+      new WindowCacheConfig().fromConfig(cfg).install();
-      final WindowCacheConfig c = new WindowCacheConfig();
-      c.fromConfig(cfg);
-      WindowCache.reconfigure(c);
     }
 
     @Override

gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java

@@ -28,7 +28,7 @@ import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.ProvisionException;
 
-import org.eclipse.jgit.storage.file.FileSnapshot;
+import org.eclipse.jgit.internal.storage.file.FileSnapshot;
 
 import java.io.File;
 import java.util.Collections;

gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java

@@ -32,8 +32,8 @@ import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
+import org.eclipse.jgit.internal.storage.file.FileSnapshot;
 import org.eclipse.jgit.lib.Config;
-import org.eclipse.jgit.storage.file.FileSnapshot;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryRepositoryManager.java

@@ -22,10 +22,10 @@ import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.RepositoryCaseMismatchException;
 
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
+import org.eclipse.jgit.internal.storage.dfs.DfsRepository;
+import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
+import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
 import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.storage.dfs.DfsRepository;
-import org.eclipse.jgit.storage.dfs.DfsRepositoryDescription;
-import org.eclipse.jgit.storage.dfs.InMemoryRepository;
 
 import java.util.Map;
 import java.util.SortedSet;

gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java

@@ -33,7 +33,7 @@ import com.google.inject.Provider;
 import org.apache.mina.core.service.IoAcceptor;
 import org.apache.mina.core.session.IoSession;
 import org.apache.sshd.server.Environment;
-import org.eclipse.jgit.storage.file.WindowCacheStatAccessor;
+import org.eclipse.jgit.internal.storage.file.WindowCacheStatAccessor;
 import org.kohsuke.args4j.Option;
 
 import java.io.File;

pom.xml

@@ -46,7 +46,7 @@ limitations under the License.
   </issueManagement>
 
   <properties>
-    <jgitVersion>2.3.1.201302201838-r.55-ge175daf</jgitVersion>
+    <jgitVersion>2.3.1.201302201838-r.70-gf32b861</jgitVersion>
     <gwtormVersion>1.6</gwtormVersion>
     <gwtjsonrpcVersion>1.3</gwtjsonrpcVersion>
     <gwtexpuiVersion>1.3.2</gwtexpuiVersion>