Skip to content
Snippets Groups Projects
Commit ede678ab authored by Matthias Sohn's avatar Matthias Sohn
Browse files

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
parents 7ba0cfa0 f9cc8632
Branches
Tags
No related merge requests found
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<properties> <properties>
<java.version>11</java.version> <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> <target-platform>jgit-4.17</target-platform>
</properties> </properties>
......
...@@ -530,7 +530,7 @@ public PackLock parse(ProgressMonitor receiving, ProgressMonitor resolving) ...@@ -530,7 +530,7 @@ public PackLock parse(ProgressMonitor receiving, ProgressMonitor resolving)
receiving.beginTask(JGitText.get().receivingObjects, receiving.beginTask(JGitText.get().receivingObjects,
(int) expectedObjectCount); (int) expectedObjectCount);
try { try {
for (int done = 0; done < expectedObjectCount; done++) { for (long done = 0; done < expectedObjectCount; done++) {
indexOneObject(); indexOneObject();
receiving.update(1); receiving.update(1);
if (receiving.isCancelled()) if (receiving.isCancelled())
......
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
<plugin> <plugin>
<groupId>org.eclipse.dash</groupId> <groupId>org.eclipse.dash</groupId>
<artifactId>license-tool-plugin</artifactId> <artifactId>license-tool-plugin</artifactId>
<version>1.0.2</version> <version>1.1.0</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment