commit 7885a9fa8d262b6127a7a3aa294108d6aac47a4d
author David Pursehouse <dpursehouse@collab.net> Tue Jan 14 10:49:21 2020 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Jan 14 10:49:21 2020 +0900
tree 50677541fdff1efb2fd0b04f240fc5273ad9762c
parent 39dd25c822be14a69282d38e5205f0ca4f2902c1
parent 4cbdd07982bb15756c27bc11a77d6b67428006fc

Merge branch 'stable-3.1'

* stable-3.1:
  DeletePreconditionsTest: Replace ExpectedException with assertThrows
  Bump Bazel version to 2.0.0
  Upgrade bazlets to latest stable-2.16 to build with 2.16.15 API
  Upgrade bazlets to latest stable-2.16 to build with 2.16.14 API

Change-Id: I995444619a82f7ce214bf8326b9ac5704ca7d51f

src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java
index d83fac7..8ae6d62 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/deleteproject/DeleteProjectIT.java
@@ -22,12 +22,12 @@
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
 import com.google.common.base.Joiner;
-import com.google.gerrit.acceptance.GerritConfig;
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.RestResponse;
 import com.google.gerrit.acceptance.TestPlugin;
 import com.google.gerrit.acceptance.UseLocalDisk;
 import com.google.gerrit.acceptance.UseSsh;
+import com.google.gerrit.acceptance.config.GerritConfig;
 import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
 import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
 import com.google.gerrit.common.data.Permission;