Merge changes Ib65b0690,I290974f0
* changes:
BasePackWriterTest: use assertThrows instead of @Test(expected=...)
[releng] Bump japicmp base version to 7.4.0.202509020913-r
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java
index 3a3413b..347fef6 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java
@@ -16,6 +16,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
@@ -201,11 +202,13 @@ public void testWriteEmptyPack2() throws IOException {
*
* @throws IOException
*/
- @Test(expected = MissingObjectException.class)
+ @Test
public void testNotIgnoreNonExistingObjects() throws IOException {
final ObjectId nonExisting = ObjectId
.fromString("0000000000000000000000000000000000000001");
- createVerifyOpenPack(NONE, haves(nonExisting), false, false);
+ assertThrows(MissingObjectException.class,
+ () -> createVerifyOpenPack(NONE, haves(nonExisting), false,
+ false));
}
/**
diff --git a/pom.xml b/pom.xml
index 4fcb974..6499596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<project.build.outputTimestamp>${commit.time.iso}</project.build.outputTimestamp>
- <jgit-last-release-version>7.3.0.202506031305-r</jgit-last-release-version>
+ <jgit-last-release-version>7.4.0.202509020913-r</jgit-last-release-version>
<ant-version>1.10.15</ant-version>
<apache-sshd-version>2.16.0</apache-sshd-version>
<jsch-version>0.1.55</jsch-version>
