diff options
7 files changed, 22 insertions, 6 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 e78a2b93cea..4ad9c4d8cf7 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 { + 26 // level 1 + 60 // content of DaoModule + 3 // content of EsModule - + 54 // content of CorePropertyDefinitions + + 55 // content of CorePropertyDefinitions + 1 // StopFlagContainer ); assertThat( diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java index fbdf1e5b556..8c49e2c62fc 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v76/MigrateModuleProperties.java @@ -31,7 +31,7 @@ import org.sonar.server.platform.db.migration.step.Upsert; @SupportsBlueGreen public class MigrateModuleProperties extends DataChange { - protected static final String NEW_PROPERTY_NAME = "sonar.modules.archivedSettings"; + protected static final String NEW_PROPERTY_NAME = "sonar.subproject.settings.archived"; private final System2 system2; 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 c30758dc895..82b69240566 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 @@ -62,6 +62,16 @@ public class CorePropertyDefinitions { defs.addAll(ScannerProperties.all()); defs.addAll(asList( + PropertyDefinition.builder(CoreProperties.MODULE_LEVEL_ARCHIVED_SETTINGS) + .name("Archived Sub-Projects Settings") + .description("DEPRECATED - Recap of the properties that were previously configured at sub-project / module level. " + + "These properties are not used anymore and should now be configured at project level. " + + "Set this parameter to empty to prevent the analysis from displaying a warning.") + .category(CoreProperties.CATEGORY_GENERAL) + .subCategory(CoreProperties.SUBCATEGORY_MODULES) + .onlyOnQualifiers(Qualifiers.PROJECT) + .type(PropertyType.TEXT) + .build(), PropertyDefinition.builder(CoreProperties.SERVER_BASE_URL) .name("Server base URL") .description("HTTP URL of this SonarQube server, such as <i>http://yourhost.yourdomain/sonar</i>. This value is used i.e. to create links in emails.") 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 dd4cb444f2d..18b2eb9d7d8 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -874,6 +874,7 @@ property.category.general.localization=Localization property.category.general.databaseCleaner=Database Cleaner property.category.general.looknfeel=Look & Feel property.category.general.issues=Issues +property.category.general.subProjects=Sub-projects property.category.organizations=Organizations property.category.security=Security property.category.security.encryption=Encryption 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 54c4a7aac16..a6c90b4b9f6 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<PropertyDefinition> defs = CorePropertyDefinitions.all(); - assertThat(defs).hasSize(54); + assertThat(defs).hasSize(55); } @Test diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java index e8066776c78..65757bbd875 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java @@ -45,6 +45,11 @@ public interface CoreProperties { String SUBCATEGORY_DATABASE_CLEANER = "databaseCleaner"; /** + * @since 7.6 + */ + String SUBCATEGORY_MODULES = "subProjects"; + + /** * @since 4.0 */ String SUBCATEGORY_DUPLICATIONS = "duplications"; @@ -530,5 +535,5 @@ public interface CoreProperties { /** * @since 7.6 */ - String MODULE_LEVEL_ARCHIVED_SETTINGS = "sonar.modules.archivedSettings"; + String MODULE_LEVEL_ARCHIVED_SETTINGS = "sonar.subproject.settings.archived"; } diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectServerSettingsProvider.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectServerSettingsProvider.java index 88f20ae9772..47d4f578ed6 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectServerSettingsProvider.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectServerSettingsProvider.java @@ -33,8 +33,8 @@ public class ProjectServerSettingsProvider extends ProviderAdapter { private static final Logger LOG = Loggers.get(ProjectConfigurationProvider.class); - private static final String MODULE_LEVEL_ARCHIVED_SETTINGS_WARNING = "Please migrate all the properties listed in " + - "`sonar.module.removedProperties` setting to appriopriate project level setting."; + private static final String MODULE_LEVEL_ARCHIVED_SETTINGS_WARNING = String.format("Please configure the settings listed in " + + "`%s` at project level and remove that setting to prevent the analysis from displaying a warning.", CoreProperties.MODULE_LEVEL_ARCHIVED_SETTINGS); private ProjectServerSettings singleton = null; |