diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2023-11-10 03:03:36 -0500 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2023-11-10 03:03:36 -0500 |
commit | 1b28c2d0018b06ee54de2d1237b5d42d98160706 (patch) | |
tree | 2fd4cdd59fad9255f77b77e342d86ff508e4168d /org.eclipse.jgit | |
parent | c2c61a88f9b1740733b847402f8f3b6a8ba0ddca (diff) | |
parent | b761a0fc3eb68bafcde576419f51ef7bf10de663 (diff) | |
download | jgit-1b28c2d0018b06ee54de2d1237b5d42d98160706.tar.gz jgit-1b28c2d0018b06ee54de2d1237b5d42d98160706.zip |
Merge changes I0d10aeac,I9aced1b7,Ied394859,Ibb61f63f,I20498746, ...
* changes:
Use try-with-resource to ensure UploadPack is closed
Fix hiding field warning
Fix warning for empty code blocks
Fix boxing warnings
errorprone: remove unnecessary parentheses
Update mockito to 5.7.0 and bytebuddy to 1.14.9
Enable Maven reproducible builds
Upgrade bazlets to the latest revision
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r-- | org.eclipse.jgit/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexLoader.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 28ba126414..32638d70fd 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -83,7 +83,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexLoader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexLoader.java index 930e711097..dff9fa52c8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexLoader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexLoader.java @@ -36,14 +36,15 @@ public class PackObjectSizeIndexLoader { if (!Arrays.equals(header, PackObjectSizeIndexWriter.HEADER)) { throw new IOException(MessageFormat.format( JGitText.get().unreadableObjectSizeIndex, - header.length, Arrays.toString(header))); + Integer.valueOf(header.length), + Arrays.toString(header))); } int version = in.readNBytes(1)[0]; if (version != 1) { - throw new IOException((MessageFormat.format( + throw new IOException(MessageFormat.format( JGitText.get().unsupportedObjectSizeIndexVersion, - version))); + Integer.valueOf(version))); } return PackObjectSizeIndexV1.parse(in); } |