Merge branch 'stable-3.2'
* stable-3.2:
ValidatorConfig: Fix wrong package for stable-3.2
ValidatorConfig: Adapt package again to latest master.
Change-Id: I62cf8c34fff085db59764e05b93f35ab34d236dc
diff --git a/WORKSPACE b/WORKSPACE
index da8db25..bd2bc1a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -12,7 +12,7 @@
"gerrit_api",
)
-gerrit_api()
+gerrit_api(version = "3.3.0-SNAPSHOT")
load("//:external_plugin_deps.bzl", "external_plugin_deps")
diff --git a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
index 15b64fe..4aae4d6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/uploadvalidator/ValidatorConfig.java
@@ -15,7 +15,7 @@
package com.googlesource.gerrit.plugins.uploadvalidator;
import com.google.gerrit.common.Nullable;
-import com.google.gerrit.common.data.AccessSection;
+import com.google.gerrit.entities.AccessSection;
import com.google.gerrit.entities.AccountGroup;
import com.google.gerrit.entities.Project;
import com.google.gerrit.exceptions.StorageException;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeConfigFactory.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeConfigFactory.java
index 79f4cc5..0aaae0f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeConfigFactory.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/FakeConfigFactory.java
@@ -34,9 +34,9 @@
@Override
public PluginConfig get(NameKey projectName) {
if (this.projectName.equals(projectName)) {
- return new PluginConfig("uploadvalidator", config);
+ return PluginConfig.create("uploadvalidator", config, null);
}
- return new PluginConfig("uploadvalidator", new Config());
+ return PluginConfig.create("uploadvalidator", new Config(), null);
}
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/TestUtils.java b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/TestUtils.java
index 22f95f0..f18295e 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/TestUtils.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/uploadvalidator/TestUtils.java
@@ -43,7 +43,8 @@
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
public class TestUtils {
- public static final PluginConfig EMPTY_PLUGIN_CONFIG = new PluginConfig("", new Config());
+ public static final PluginConfig EMPTY_PLUGIN_CONFIG =
+ PluginConfig.create("", new Config(), null);
protected static final byte[] EMPTY_CONTENT = "".getBytes(Charsets.UTF_8);
