diff --git a/WORKSPACE b/WORKSPACE
index 6404298..b8aa911 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -177,15 +177,9 @@
 )
 
 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
index 23f03e8..203051b 100644
--- a/java/com/google/gitiles/CommitData.java
+++ b/java/com/google/gitiles/CommitData.java
@@ -203,7 +203,7 @@
           .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
index cfb3eae..8e90e16 100644
--- a/javatests/com/google/gitiles/BUILD
+++ b/javatests/com/google/gitiles/BUILD
@@ -36,7 +36,7 @@
         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
index 7c03dd3..f3e9cca 100644
--- a/lib/junit/BUILD
+++ b/lib/junit/BUILD
@@ -10,6 +10,6 @@
 )
 
 java_library(
-    name = "hamcrest-core",
-    exports = ["@hamcrest-core//jar"],
+    name = "hamcrest",
+    exports = ["@hamcrest//jar"],
 )
diff --git a/modules/jgit b/modules/jgit
index 1f062c6..2d9ed3c 160000
--- a/modules/jgit
+++ b/modules/jgit
@@ -1 +1 @@
-Subproject commit 1f062c64be839a66e9ddd7faa0040312ef8ea774
+Subproject commit 2d9ed3cf2aa01491e43d5108bda5dc494b53e1f8