aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2024-08-20 14:54:08 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2024-08-20 14:54:44 +0200
commitede678abf6bc821bbab6ee63e0a14660c9c886c6 (patch)
tree529000d63aff2cbde10b39f707f1258c2a839022
parent7ba0cfa0c1c91838af9dc1b551b73ae2c4dc40ef (diff)
parentf9cc863220814d70440766c3ac80c61bc69cae4f (diff)
downloadjgit-ede678abf6bc821bbab6ee63e0a14660c9c886c6.tar.gz
jgit-ede678abf6bc821bbab6ee63e0a14660c9c886c6.zip
Merge branch 'stable-6.6' into stable-6.7
* stable-6.6: Update tycho to 4.0.8 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: I79bb467325e5c09d93e0220be8233ba0d91562cb
-rw-r--r--org.eclipse.jgit.packaging/pom.xml2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java2
-rw-r--r--pom.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index 63c2e4c430..e014297d6f 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -23,7 +23,7 @@
<properties>
<java.version>11</java.version>
- <tycho-version>4.0.2</tycho-version>
+ <tycho-version>4.0.8</tycho-version>
<target-platform>jgit-4.17</target-platform>
</properties>
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 fe9ddabf8e..f09731d290 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 abstract class PackParser {
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 3304587c63..fd5020ac95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,7 +389,7 @@
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0</version>
</plugin>
</plugins>
</pluginManagement>