From c1e7969342dfa6d4b004c88df7867b00bca60418 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Wed, 6 Mar 2019 10:59:40 +0000
Subject: [PATCH 1/3] Revert "Revert "Upgrade JGit dependency to 5.2.1""

This reverts commit 42b5a32670e43b307ec2b0a34380e373b16be1fe.
---
 services/git-bridge/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/git-bridge/pom.xml b/services/git-bridge/pom.xml
index 4499489564..a63bab6106 100644
--- a/services/git-bridge/pom.xml
+++ b/services/git-bridge/pom.xml
@@ -100,13 +100,13 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>4.10.0.201712302008-r</version>
+            <version>5.2.1.201812262042-r</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.eclipse.jgit/org.eclipse.jgit.http.server -->
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit.http.server</artifactId>
-            <version>4.10.0.201712302008-r</version>
+            <version>5.2.1.201812262042-r</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
         <dependency>

From 600aa8d9cf7de2f7072e2b92520c5ee7d37be9d3 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Wed, 6 Mar 2019 11:41:59 +0000
Subject: [PATCH 2/3] Do `mvn clean` before build.

We've had build issues be hidden by caching. So we should build from
clean each time, in immitation of the prod build process.
---
 services/git-bridge/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/git-bridge/Makefile b/services/git-bridge/Makefile
index 18ec01588e..599d096cee 100644
--- a/services/git-bridge/Makefile
+++ b/services/git-bridge/Makefile
@@ -17,7 +17,7 @@ clean:
 	mvn clean
 
 
-package:
+package: clean
 	mvn package
 
 

From 788fad5ce7af39f95ef95132aa800643e531eb77 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Wed, 6 Mar 2019 11:43:27 +0000
Subject: [PATCH 3/3] Remove a deprecated method, no longer compatible with
 JGit 5.2

---
 .../ac/ic/wlgitbridge/bridge/repo/NoGitignoreIterator.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/repo/NoGitignoreIterator.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/repo/NoGitignoreIterator.java
index 0cdb10ac15..065aa6d024 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/repo/NoGitignoreIterator.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/repo/NoGitignoreIterator.java
@@ -51,11 +51,6 @@ public class NoGitignoreIterator extends FileTreeIterator {
         super(root, fs, options, fileModeStrategy);
     }
 
-    @Deprecated
-    protected NoGitignoreIterator(WorkingTreeIterator p, File root, FS fs) {
-        super(p, root, fs);
-    }
-
     protected NoGitignoreIterator(FileTreeIterator p, File root, FS fs) {
         super(p, root, fs);
     }