Adapt to the latest changes in Gerrit master Gerrit master has migrated the PluginConfig to autovalue and moved AccessSection to com.google.gerrit.entities. Change-Id: I2ce91834f6d9bbcc94345786808372e23e1dce93
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/InitIts.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/InitIts.java index fbb6e39..91e84a1 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/InitIts.java +++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/InitIts.java
@@ -15,7 +15,7 @@ package com.googlesource.gerrit.plugins.its.base.its; import com.google.common.base.Strings; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.pgm.init.api.AllProjectsConfig; import com.google.gerrit.pgm.init.api.AllProjectsNameOnInitProvider; import com.google.gerrit.pgm.init.api.ConsoleUI;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java index 3429ba4..668ff1e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java +++ b/src/main/java/com/googlesource/gerrit/plugins/its/base/its/ItsConfig.java
@@ -18,7 +18,7 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.common.Nullable; -import com.google.gerrit.common.data.AccessSection; +import com.google.gerrit.entities.AccessSection; import com.google.gerrit.entities.Project; import com.google.gerrit.entities.Project.NameKey; import com.google.gerrit.extensions.annotations.PluginName; @@ -274,7 +274,7 @@ "Cannot access %s configuration for plugin %s", projectName, pluginName); } } - return new PluginConfig(pluginName, new Config()); + return PluginConfig.create(pluginName, new Config(), null); } private List<CommentLinkInfo> getCommentLinkInfo(final String commentlinkName) {