Merge changes Icf4d0259,I488046e9 * changes: Fix relative hyperlinks in Markdown Fix checkView error for missing servletPath
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java b/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java index e0cc53e..da9138e 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/PathServlet.java
@@ -23,7 +23,6 @@ import static org.eclipse.jgit.lib.Constants.OBJ_TREE; import com.google.common.base.Joiner; -import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists;
diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java b/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java index 70dcf9a..998d546 100644 --- a/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java +++ b/gitiles-servlet/src/main/java/com/google/gitiles/TreeJsonData.java
@@ -15,7 +15,6 @@ package com.google.gitiles; import static java.nio.charset.StandardCharsets.UTF_8; -import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.Lists; @@ -23,8 +22,6 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.ObjectReader; -import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.treewalk.TreeWalk; import java.io.IOException;
diff --git a/lib/jgit/BUCK b/lib/jgit/BUCK index 8da5493..4736cf5 100644 --- a/lib/jgit/BUCK +++ b/lib/jgit/BUCK
@@ -1,10 +1,10 @@ REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL. -VERS = '4.2.0.201601211800-r.136-g8efdaaf' +VERS = '4.3.0.201604071810-r.23-gc9b0028' maven_jar( name = 'jgit', id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS, - sha1 = '32f50e3c0c4f53d8fdca147d3ff0b6ef0dc02eb0', + sha1 = 'dc4464c876cbf3815fd6cf6cb9d29d375566d6b1', repository = REPO, unsign = True, deps = [':ewah'], @@ -18,7 +18,7 @@ maven_jar( name = 'jgit-servlet', id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS, - sha1 = 'b493401b9778cdc38f7c08f111c6385a434b2ac2', + sha1 = 'bb01841b74a48abe506c2e44f238e107188e6c8f', repository = REPO, deps = [':jgit'], unsign = True, @@ -41,7 +41,7 @@ maven_jar( name = 'jgit-archive_library', id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS, - sha1 = '1b3a0cb7b8c2629e33902b3daf1067accca62eaf', + sha1 = 'c612e5bd40ebf6226032cb32c14b396d7ebfe036', repository = REPO, deps = [':jgit'], unsign = True, @@ -54,7 +54,7 @@ maven_jar( name = 'junit', id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS, - sha1 = 'c68ddb3e2aaca05b1d2f8250dd107b5f484ed603', + sha1 = '62dddedccdcd67b622d0d35a4bfb15c7eab8e171', repository = REPO, unsign = True, deps = [':jgit'],