summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2024-08-20 14:56:04 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2024-08-20 14:56:13 +0200
commit7dceb15e53a533843b964203bdc2e8d07a32a436 (patch)
tree5e88799a789040aea015e901310f9bd94528c954
parent9377d3190d668827a24a5ff0c7ad9eeacb19bb7d (diff)
parentede678abf6bc821bbab6ee63e0a14660c9c886c6 (diff)
downloadjgit-7dceb15e53a533843b964203bdc2e8d07a32a436.tar.gz
jgit-7dceb15e53a533843b964203bdc2e8d07a32a436.zip
Merge branch 'stable-6.7' into stable-6.8
* stable-6.7: 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: I513a1cbb2bfd002d125b04f7944a625ca52decea
-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 2e45e4015d..03469db379 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -30,7 +30,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>
<project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp>
</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 c6bf77db24..fc9789d0bc 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 e605467b7c..9533ee4bef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,7 +363,7 @@
<plugin>
<groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId>
- <version>1.0.2</version>
+ <version>1.1.0</version>
</plugin>
<plugin>
<groupId>org.cyclonedx</groupId>