Merge branch 'stable-3.1'
* stable-3.1:
Remove plugin-manager from the list of core plugins
Remove BUCK build
Remove check with hardcoded GERRIT_NEXT_VERSION
Fix core plugin name extractions without MANIFEST.MF
Backport tests from master to stable-2.16
Change-Id: I0fa80b0bb486cb54fa56c1c1be893947d748d525
diff --git a/src/main/java/com/googlesource/gerrit/plugins/manager/ListAvailablePlugins.java b/src/main/java/com/googlesource/gerrit/plugins/manager/ListAvailablePlugins.java
index ceeda09..e444c51 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/manager/ListAvailablePlugins.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/manager/ListAvailablePlugins.java
@@ -42,14 +42,9 @@
@Override
public Response<Map<String, PluginInfo>> apply(TopLevelResource resource)
- throws RestApiException {
+ throws RestApiException, ExecutionException {
Map<String, PluginInfo> output = Maps.newTreeMap();
- List<PluginInfo> plugins;
- try {
- plugins = new ArrayList<>(pluginsCache.availablePlugins());
- } catch (ExecutionException e) {
- throw new RestApiException("Unable to load the list of available plugins", e);
- }
+ List<PluginInfo> plugins = new ArrayList<>(pluginsCache.availablePlugins());
Collections.sort(
plugins,
new Comparator<PluginInfo>() {
diff --git a/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java b/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java
index 7730ef8..a5d108d 100644
--- a/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java
+++ b/src/test/java/com/google/gerrit/server/restapi/config/PluginManagerTopMenuIT.java
@@ -16,10 +16,10 @@
import static com.google.common.truth.Truth.assertThat;
-import com.google.gerrit.acceptance.GerritConfig;
import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.TestPlugin;
+import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.acceptance.testsuite.request.RequestScopeOperations;
import com.google.gerrit.extensions.client.MenuItem;
import com.google.gerrit.extensions.webui.TopMenu.MenuEntry;
