commit 3f25ccf9d2c7a17e76008da111e7ee79b8d258d1
author Matthias Sohn <matthias.sohn@sap.com> Mon Jan 30 09:54:26 2023 +0100
committer Matthias Sohn <matthias.sohn@sap.com> Mon Jan 30 09:59:15 2023 +0100
tree 92c4ca8e8a86bc3343d96f5bc73fba4e51229826
parent 3d616d3bdde1374c0bde05381992e803bb04c5a0

Adapt to API changes in Gerrit 3.7 introduced in I3fccb05d21

Release-Notes: Adapt to API changes in Gerrit 3.7
Change-Id: Id92a98959a801914ebc7d4b54cff753dedf90c20

src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java

diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
index 61ee2b5..326c7c7 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
@@ -32,7 +32,7 @@
 import com.google.gerrit.server.events.RefUpdatedEvent;
 import com.google.gerrit.server.events.ReviewerDeletedEvent;
 import com.google.gerrit.server.events.TopicChangedEvent;
-import com.google.gerrit.server.git.MergeUtil;
+import com.google.gerrit.server.git.MergeUtilFactory;
 import com.google.gerrit.server.query.change.ChangeData;
 import com.google.gerrit.server.restapi.change.GetRelated;
 import com.google.gerrit.server.restapi.change.PostReview;
@@ -59,7 +59,7 @@
 
   @Inject GetRelated getRelated;
 
-  @Inject MergeUtil.Factory mergeUtilFactory;
+  @Inject MergeUtilFactory mergeUtilFactory;
 
   @Inject Provider<PostReview> reviewer;