From 152cf9835b1cfd4a817b83ec48e2b1f474e8490f Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 18 Mar 2014 15:22:28 +0100 Subject: 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 --- .../main/java/org/sonar/plugins/core/ExclusionProperties.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins/sonar-core-plugin') 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 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) -- cgit v1.2.3