diff options
| author | Jenkins CI <ci@sonarsource.com> | 2015-12-11 08:01:20 +0100 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2015-12-11 08:01:20 +0100 |
| commit | d547fdddf958c20cddd00cdbf7a280182400f595 (patch) | |
| tree | 2ffb39ec347ad77c4a772c7fe0f7dfc49120c96d /sonar-core | |
| parent | 39f16286bfcd6dc247352e34f0fb93cc202104c4 (diff) | |
| parent | 56a4685a6061731fe701ea3ec8afbf9a8a1015f0 (diff) | |
| download | sonarqube-d547fdddf958c20cddd00cdbf7a280182400f595.tar.gz sonarqube-d547fdddf958c20cddd00cdbf7a280182400f595.zip | |
Automatic merge from branch-5.3
* origin/branch-5.3:
SONAR-6968 Bad error message when analyzer detects that no language plugins are installed
SONAR-6905 Batch should dump analysis-related URL into a properties file
fix displaying of the workspace on the overview pages
SONAR-7030 Remove dashboards bundles
Reactivate devcockpit in PluginsTest
fix link to added issues from the debt overview
respect precision of float metrics during web formatting
Diffstat (limited to 'sonar-core')
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/platform/ComponentContainer.java | 2 | ||||
| -rw-r--r-- | sonar-core/src/main/resources/org/sonar/l10n/core.properties | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/sonar-core/src/main/java/org/sonar/core/platform/ComponentContainer.java b/sonar-core/src/main/java/org/sonar/core/platform/ComponentContainer.java index 6789d45e61b..ff4dceaef4c 100644 --- a/sonar-core/src/main/java/org/sonar/core/platform/ComponentContainer.java +++ b/sonar-core/src/main/java/org/sonar/core/platform/ComponentContainer.java @@ -59,7 +59,7 @@ public class ComponentContainer implements ContainerPopulator.Container { try { return super.getComponent(componentKeyOrType, annotation); } catch (Throwable t) { - throw new IllegalStateException("Unable to load component " + componentKeyOrType + ": " + t.getMessage(), t); + throw new IllegalStateException("Unable to load component " + componentKeyOrType, t); } } diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 01d36315595..e249705826b 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -1046,18 +1046,6 @@ property.error.notFloat=Not a floating point number property.error.notInOptions=Not a valid option property.category.scm=SCM - -#------------------------------------------------------------------------------ -# -# DASHBOARDS -# -#------------------------------------------------------------------------------ - -# Default dashboard -dashboard.Dashboard.name=Custom -dashboard.Hotspots.name=Hotspots -dashboard.Reviews.name=Reviews - #------------------------------------------------------------------------------ # # SEARCH ENGINE FOR RESOURCES |