diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-12-29 01:21:06 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-12-29 01:53:04 +0100 |
| commit | 5fd2aa673af1f19e81b8aa4f6905fe735b917f83 (patch) | |
| tree | 8050d35101d85f645f6d49d278c1cd34e0bb2b3a | |
| parent | 47c9574343a4a556108e2a5a1e4af8741cb65483 (diff) | |
| download | jgit-5fd2aa673af1f19e81b8aa4f6905fe735b917f83.tar.gz jgit-5fd2aa673af1f19e81b8aa4f6905fe735b917f83.zip | |
SimpleMergeTest: replace deprecated PersonIdent constructor
Change-Id: Ic40473aecb23e22c755a9e041592886fb3c448f9
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java index 798aebe3b0..0016adfb66 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java @@ -16,6 +16,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.time.Instant; +import java.time.ZoneOffset; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuilder; @@ -375,7 +377,8 @@ public class SimpleMergeTest extends SampleDataRepositoryTestCase { ObjectId[] parentIds) throws Exception { CommitBuilder c = new CommitBuilder(); c.setTreeId(treeB.writeTree(odi)); - c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0)); + c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", + Instant.ofEpochMilli(1L), ZoneOffset.UTC)); c.setCommitter(c.getAuthor()); c.setParentIds(parentIds); c.setMessage("Tree " + c.getTreeId().name()); |