diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2015-01-28 09:31:53 +0100 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2015-01-28 09:31:53 +0100 |
| commit | e41e179891923f2c6e239fce3f56983cfff3c8b3 (patch) | |
| tree | f0b2894e6c0e9b01f4c72ffb156b520cdfeb594a | |
| parent | 5593132d32277a2111ecceb8cd31abb404a00d0a (diff) | |
| download | sonarqube-e41e179891923f2c6e239fce3f56983cfff3c8b3.tar.gz sonarqube-e41e179891923f2c6e239fce3f56983cfff3c8b3.zip | |
SONAR-6105 Fix missing SVN and Git plugins
| -rw-r--r-- | sonar-application/assembly.xml | 2 | ||||
| -rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/scm/ScmConfiguration.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index 3773b757155..f2578a18dc5 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -105,7 +105,7 @@ <outputDirectory>lib/bundled-plugins</outputDirectory> <useTransitiveDependencies>false</useTransitiveDependencies> <includes> - <include>org.codehaus.sonar-plugins.*:sonar-*-plugin</include> + <include>org.codehaus.sonar-plugins*:sonar-*-plugin</include> </includes> <scope>provided</scope> </dependencySet> diff --git a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmConfiguration.java b/sonar-batch/src/main/java/org/sonar/batch/scm/ScmConfiguration.java index d600a3d4ba2..d95f870b5ac 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scm/ScmConfiguration.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scm/ScmConfiguration.java @@ -101,8 +101,8 @@ public final class ScmConfiguration implements BatchComponent, Startable { if (providerPerKey.containsKey(forcedProviderKey)) { this.provider = providerPerKey.get(forcedProviderKey); } else { - throw new IllegalArgumentException("SCM provider was set to \"" + forcedProviderKey + "\" but no provider found for this key. Supported providers are " - + Joiner.on(",").join(providerPerKey.keySet())); + String supportedProviders = providerPerKey.isEmpty() ? "No SCM provider installed" : "Supported SCM providers are " + Joiner.on(",").join(providerPerKey.keySet()); + throw new IllegalArgumentException("SCM provider was set to \"" + forcedProviderKey + "\" but no SCM provider found for this key. " + supportedProviders); } } |