Update JGit

jrn · jrn · commit c383b261579c · 2022-03-16T17:14:32.000-07:00
Repository#getAllRefsByPeeledObjectId now throws IOException so we
have to propagate it.  No other changes required.

Reported-by: Alina Djamankulova &lt;adjama@google.com&gt;
Change-Id: I172ec48fe2d54a1ffcfcc74a775eac5e11bc7650
diff --git a/WORKSPACE b/WORKSPACE
@@ -177,15 +177,9 @@ maven_jar(
 )
 
 maven_jar(
-    name = "hamcrest-library",
-    artifact = "org.hamcrest:hamcrest-library:1.3",
-    sha1 = "4785a3c21320980282f9f33d0d1264a69040538f",
-)
-
-maven_jar(
-    name = "hamcrest-core",
-    artifact = "org.hamcrest:hamcrest-core:1.3",
-    sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
+    name = "hamcrest",
+    artifact = "org.hamcrest:hamcrest:2.2",
+    sha1 = "1820c0968dba3a11a1b30669bb1f01978a91dedc",
 )
 
 maven_jar(
diff --git a/java/com/google/gitiles/CommitData.java b/java/com/google/gitiles/CommitData.java
@@ -203,7 +203,7 @@ private static String urlFromView(
           .toUrl();
     }
 
-    private List<Ref> getRefsById(Repository repo, ObjectId id, String prefix) {
+    private List<Ref> getRefsById(Repository repo, ObjectId id, String prefix) throws IOException {
       if (refsById == null) {
         refsById = repo.getAllRefsByPeeledObjectId();
       }
diff --git a/javatests/com/google/gitiles/BUILD b/javatests/com/google/gitiles/BUILD
@@ -36,7 +36,7 @@ junit_tests(
         exclude = ["**/ServletTest.java"],
     ),
     visibility = ["//visibility:public"],
-    runtime_deps = ["//lib/junit:hamcrest-core"],
+    runtime_deps = ["//lib/junit:hamcrest"],
     deps = DEPS + [
         "//java/com/google/gitiles:servlet",
         ":testutil",
diff --git a/lib/junit/BUILD b/lib/junit/BUILD
@@ -10,6 +10,6 @@ java_library(
 )
 
 java_library(
-    name = "hamcrest-core",
-    exports = ["@hamcrest-core//jar"],
+    name = "hamcrest",
+    exports = ["@hamcrest//jar"],
 )
diff --git a/modules/jgit b/modules/jgit
@@ -1 +1 @@
-Subproject commit 1f062c64be839a66e9ddd7faa0040312ef8ea774
+Subproject commit 2d9ed3cf2aa01491e43d5108bda5dc494b53e1f8

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ private static String urlFromView(`
`203`	`203`	`.toUrl();`
`204`	`204`	`}`
`205`	`205`
`206`		`- private List<Ref> getRefsById(Repository repo, ObjectId id, String prefix) {`
	`206`	`+ private List<Ref> getRefsById(Repository repo, ObjectId id, String prefix) throws IOException {`
`207`	`207`	`if (refsById == null) {`
`208`	`208`	`refsById = repo.getAllRefsByPeeledObjectId();`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ java_library(`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`java_library(`
`13`		`- name = "hamcrest-core",`
`14`		`- exports = ["@hamcrest-core//jar"],`
	`13`	`+ name = "hamcrest",`
	`14`	`+ exports = ["@hamcrest//jar"],`
`15`	`15`	`)`