From 35428013060d9fb81e7119426e9bfe9858521d4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 19 Jul 2018 10:17:25 +0200 Subject: [PATCH] SONAR-11004 remove definitions for sonar.links.* properties they must not be displayed in the UI properties are not used on server side scanner does not rely on the definitions => drop the definitions --- .../ComputeEngineContainerImplTest.java | 2 +- .../core/config/CorePropertyDefinitions.java | 21 ------------------- .../config/CorePropertyDefinitionsTest.java | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index 4cea397abf1..fc8243e4893 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -123,7 +123,7 @@ public class ComputeEngineContainerImplTest { + 30 // level 1 + 55 // content of DaoModule + 3 // content of EsModule - + 58 // content of CorePropertyDefinitions + + 54 // content of CorePropertyDefinitions + 1 // StopFlagContainer ); assertThat( diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java index 9d2d9e48c43..bb991263ae6 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -69,27 +69,6 @@ public class CorePropertyDefinitions { .category(CoreProperties.CATEGORY_GENERAL) .build(), - PropertyDefinition.builder(CoreProperties.LINKS_HOME_PAGE) - .name("Project Home Page") - .description("HTTP URL of the home page of the project.") - .hidden() - .build(), - PropertyDefinition.builder(CoreProperties.LINKS_CI) - .name("CI server") - .description("HTTP URL of the continuous integration server.") - .category(CoreProperties.CATEGORY_GENERAL) - .build(), - PropertyDefinition.builder(CoreProperties.LINKS_ISSUE_TRACKER) - .name("Issue Tracker") - .description("HTTP URL of the issue tracker.") - .category(CoreProperties.CATEGORY_GENERAL) - .hidden() - .build(), - PropertyDefinition.builder(CoreProperties.LINKS_SOURCES) - .name("SCM server") - .description("HTTP URL of the server which hosts the sources of the project.") - .category(CoreProperties.CATEGORY_GENERAL) - .build(), PropertyDefinition.builder(CoreProperties.PREVIEW_INCLUDE_PLUGINS) .name("Plugins accepted for Preview mode") .description("DEPRECATED - List of plugin keys. Those plugins will be used during preview analyses.") diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java index 75724cd1569..a4dc6a88a16 100644 --- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java @@ -30,7 +30,7 @@ public class CorePropertyDefinitionsTest { @Test public void all() { List defs = CorePropertyDefinitions.all(); - assertThat(defs).hasSize(58); + assertThat(defs).hasSize(54); } @Test -- 2.39.5