Merge changes from topics "fixJdkObsoleteDatePart5", "fixJdkObsoleteDatePart8"
* changes:
Adapt to change of IdentifiedUser#newCommitterIdent
Adapt to usage of Instant for BatchUpdate.Factory
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java
index 9e15746..81e6ab5 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnerConfigFileUpdateScanner.java
@@ -183,8 +183,7 @@
cb.setParentId(parentCommit);
cb.setTreeId(treeId);
cb.setCommitter(serverIdent);
- cb.setAuthor(
- identifiedUser.get().newCommitterIdent(serverIdent.getWhen(), serverIdent.getTimeZone()));
+ cb.setAuthor(identifiedUser.get().newCommitterIdent(serverIdent));
cb.setMessage(commitMessage);
ObjectId id = objectInserter.insert(cb);
objectInserter.flush();
diff --git a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnAddReviewer.java b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnAddReviewer.java
index 68a7672..be028c8 100644
--- a/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnAddReviewer.java
+++ b/java/com/google/gerrit/plugins/codeowners/backend/CodeOwnersOnAddReviewer.java
@@ -158,7 +158,7 @@
"addCodeOwnersMessageOnAddReviewer",
updateFactory -> {
try (BatchUpdate batchUpdate =
- updateFactory.create(projectName, currentUser, when)) {
+ updateFactory.create(projectName, currentUser, when.toInstant())) {
batchUpdate.addOp(changeId, new Op(reviewers, maxPathsInChangeMessages));
batchUpdate.execute();
}