Merge branch 'stable-6.4' into stable-6.5 * stable-6.4: Update org.eclipse.dash:license-tool-plugin to 1.1.0 Fix "Comparison of narrow type with wide type in loop condition" JGit v5.13.3.202401111512-r Change-Id: Ieae366586ac4c449a4f9454dc4b63513e7573776
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java index d966904..9bb38bb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java
@@ -530,7 +530,7 @@ public PackLock parse(ProgressMonitor receiving, ProgressMonitor resolving) receiving.beginTask(JGitText.get().receivingObjects, (int) expectedObjectCount); try { - for (int done = 0; done < expectedObjectCount; done++) { + for (long done = 0; done < expectedObjectCount; done++) { indexOneObject(); receiving.update(1); if (receiving.isCancelled())
diff --git a/pom.xml b/pom.xml index 37c8613..3744226 100644 --- a/pom.xml +++ b/pom.xml
@@ -397,7 +397,7 @@ <plugin> <groupId>org.eclipse.dash</groupId> <artifactId>license-tool-plugin</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>1.1.0</version> </plugin> </plugins> </pluginManagement>