Merge branch 'stable-3.2'
* stable-3.2:
Upgrade bazlets to latest master to build with 3.2.3 API
Upgrade bazlets to latest stable-3.1 to build with 3.1.8 API
Upgrade bazlets to latest stable-3.0 to build with 3.0.12 API
Upgrade bazlets to latest stable-2.16 to build with 2.16.22 API
Switch to the snapshot API to build stand-alone successfully, until the
next release (API) that contains the previously adapted code for master.
Change-Id: I0a3ee3335ef53b8d7b10e4323000ee0cfc602ee2
diff --git a/WORKSPACE b/WORKSPACE
index 4e9ba46..c342b1d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -12,4 +12,4 @@
"gerrit_api",
)
-gerrit_api()
+gerrit_api(version = "3.3.0-SNAPSHOT")
diff --git a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java
index bb6db02..810e85e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/ratelimiter/Configuration.java
@@ -17,8 +17,8 @@
import com.google.common.collect.ArrayTable;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Table;
-import com.google.gerrit.common.data.GroupDescription.Basic;
import com.google.gerrit.entities.AccountGroup;
+import com.google.gerrit.entities.GroupDescription.Basic;
import com.google.gerrit.extensions.annotations.PluginName;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.group.GroupResolver;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java
index cc353a5..a4046b3 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/ConfigurationTest.java
@@ -18,8 +18,8 @@
import static com.google.gerrit.testing.GerritJUnit.assertThrows;
import static org.mockito.Mockito.when;
-import com.google.gerrit.common.data.GroupDescription;
import com.google.gerrit.entities.AccountGroup;
+import com.google.gerrit.entities.GroupDescription;
import com.google.gerrit.server.config.PluginConfigFactory;
import com.google.gerrit.server.group.GroupResolver;
import com.google.inject.ProvisionException;
