github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-27 10:21:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Sk upgrade jgit 5.2 redux
This commit is contained in:
Shane Kilkelly 2019-03-07 14:03:25 +00:00 committed by GitHub
commit 78220d6430
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/git-bridge/Makefile
View file

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

4
services/git-bridge/pom.xml
View file

@ -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>

5
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/repo/NoGitignoreIterator.java
View file

@ -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);
}