From d8f1d06ab086c00d8693d8226a30781f52c02594 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 17 Apr 2014 15:28:24 +0200 Subject: SONAR-5225 Move English bundles to core module --- .../java/org/sonar/batch/bootstrap/BatchPluginRepository.java | 9 ++------- .../org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java | 9 --------- 2 files changed, 2 insertions(+), 16 deletions(-) (limited to 'sonar-batch') diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java index 584ecce1cad..2e2b09da23c 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java +++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchPluginRepository.java @@ -36,11 +36,7 @@ import org.sonar.core.plugins.RemotePlugin; import java.io.File; import java.text.MessageFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newHashSet; @@ -49,7 +45,6 @@ public class BatchPluginRepository implements PluginRepository { private static final Logger LOG = LoggerFactory.getLogger(BatchPluginRepository.class); private static final String CORE_PLUGIN = "core"; - private static final String ENGLISH_PACK_PLUGIN = "l10nen"; private PluginDownloader pluginDownloader; private Map pluginsByKey; @@ -164,7 +159,7 @@ public class BatchPluginRepository implements PluginRepository { } boolean accepts(String pluginKey) { - if (CORE_PLUGIN.equals(pluginKey) || ENGLISH_PACK_PLUGIN.equals(pluginKey)) { + if (CORE_PLUGIN.equals(pluginKey)) { return true; } diff --git a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java index b1a4eb2a999..0592c2158d4 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/bootstrap/BatchPluginRepositoryTest.java @@ -158,15 +158,6 @@ public class BatchPluginRepositoryTest { assertThat(filter.accepts("core")).isTrue(); } - // English Pack plugin should never be blacklisted as it is mandatory for the I18nManager on batch side - @Test - public void englishPackPluginShouldNeverBeInBlackList() { - Settings settings = new Settings() - .setProperty(CoreProperties.BATCH_EXCLUDE_PLUGINS, "l10nen,findbugs"); - BatchPluginRepository.PluginFilter filter = new BatchPluginRepository.PluginFilter(settings, mode); - assertThat(filter.accepts("l10nen")).isTrue(); - } - @Test public void check_white_list_with_black_list() { Settings settings = new Settings() -- cgit v1.2.3