Преглед изворни кода

Merge pull request #54 from overleaf/sk-upgrade-jgit-5.2-redux

Sk upgrade jgit 5.2 redux
Shane Kilkelly пре 7 година
родитељ
комит
78220d6430

+ 1 - 1
services/git-bridge/Makefile

@@ -17,7 +17,7 @@ clean:
 	mvn clean
 
 
-package:
+package: clean
 	mvn package
 
 

+ 2 - 2
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>

+ 0 - 5
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);
     }