Merge pull request #100 from VariantSync/dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.7.0.202309050840-r

ibbem · web-flow · commit e439a671d8bd · 2023-09-21T20:51:44.000+02:00
build(deps): bump org.eclipse.jgit:org.eclipse.jgit from 6.4.0.202211300538-r to 6.7.0.202309050840-r
diff --git a/default.nix b/default.nix
@@ -45,7 +45,7 @@ pkgs.stdenv.mkDerivation rec {
     dontConfigure = true;
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "sha256-gmbyhqgMMZxt3+7ov/Zgm1EGdZBhn4WfAj8yphhg2CA=";
+    outputHash = "sha256-qIKFqNwooJ0iqzkv6TTS5GM4bA6iYkVa35zqE+q5izY=";
   };
 
   buildPhase = ''
diff --git a/pom.xml b/pom.xml
@@ -122,7 +122,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.4.0.202211300538-r</version>
+            <version>6.7.0.202309050840-r</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/org/variantsync/diffdetective/load/LoggingProgressMonitor.java b/src/main/java/org/variantsync/diffdetective/load/LoggingProgressMonitor.java
@@ -32,4 +32,9 @@ public void endTask() {
     public boolean isCancelled() {
         return false;
     }
+
+    @Override
+    public void showDuration(boolean enabled) {
+
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,9 @@ public void endTask() {`
`32`	`32`	`public boolean isCancelled() {`
`33`	`33`	`return false;`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ @Override`
	`37`	`+ public void showDuration(boolean enabled) {`
	`38`	`+`
	`39`	`+ }`
`35`	`40`	`}`