diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2014-03-18 15:22:28 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2014-03-18 15:37:59 +0100 |
| commit | 152cf9835b1cfd4a817b83ec48e2b1f474e8490f (patch) | |
| tree | cd4feca1e750aa35b249b965158c9389f87dbec8 /plugins/sonar-core-plugin | |
| parent | d8615a4edd4f958109de1b8dcd3caebb8958a55e (diff) | |
| download | sonarqube-152cf9835b1cfd4a817b83ec48e2b1f474e8490f.tar.gz sonarqube-152cf9835b1cfd4a817b83ec48e2b1f474e8490f.zip | |
SONAR-5143 revert. Inclusions are coming back to UI !
Conflicts:
sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
sonar-server/src/main/webapp/WEB-INF/db/migrate/499_delete_inclusions_properties.rb
Diffstat (limited to 'plugins/sonar-core-plugin')
| -rw-r--r-- | plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java index 00d7e7c0611..b169a572965 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/ExclusionProperties.java @@ -34,24 +34,22 @@ class ExclusionProperties { static List<PropertyDefinition> definitions() { return ImmutableList.of( - - // Do not display inclusions in UI - // https://jira.codehaus.org/browse/SONAR-5143 PropertyDefinition.builder(CoreProperties.PROJECT_INCLUSIONS_PROPERTY) .name("Source File Inclusions") .multiValues(true) .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) - .hidden() + .onQualifiers(Qualifiers.PROJECT) + .index(3) .build(), PropertyDefinition.builder(CoreProperties.PROJECT_TEST_INCLUSIONS_PROPERTY) .name("Test File Inclusions") .multiValues(true) .category(CoreProperties.CATEGORY_EXCLUSIONS) .subCategory(CoreProperties.SUBCATEGORY_FILES_EXCLUSIONS) - .hidden() + .onQualifiers(Qualifiers.PROJECT) + .index(5) .build(), - PropertyDefinition.builder(CoreProperties.GLOBAL_EXCLUSIONS_PROPERTY) .name("Global Source File Exclusions") .multiValues(true) |