Merge branch 'stable-3.4' into stable-3.5 * stable-3.4: Use com.google.gerrit.entities.InternalGroup Change-Id: I36cbd203f3b14a416f2d982ebb0f919d0051f77d
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java index 3cca663..16e200a 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java +++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
@@ -16,6 +16,7 @@ import com.google.common.base.Strings; import com.google.gerrit.entities.AccountGroup; +import com.google.gerrit.entities.InternalGroup; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.common.GroupInfo; import com.google.gerrit.extensions.restapi.Response; @@ -24,7 +25,6 @@ import com.google.gerrit.server.config.ConfigResource; import com.google.gerrit.server.config.PluginConfig; import com.google.gerrit.server.config.PluginConfigFactory; -import com.google.gerrit.server.group.InternalGroup; import com.google.gerrit.server.group.InternalGroupDescription; import com.google.gerrit.server.permissions.PermissionBackendException; import com.google.gerrit.server.restapi.group.GroupJson;