diff --git a/.cirrus.yml b/.cirrus.yml index 6e7b6a5cfa..412cf4953f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -176,7 +176,7 @@ plugin_qa_task: CIRRUS_CLONE_DEPTH: 10 SONARSOURCE_QA: true matrix: - - SQ_VERSION: LATEST_RELEASE[10.6] + - SQ_VERSION: LATEST_RELEASE[25.1] - SQ_VERSION: DEV maven_cache: folder: ${CIRRUS_WORKING_DIR}/.m2/repository diff --git a/python-commons/src/main/java/org/sonar/plugins/python/PythonExtensions.java b/python-commons/src/main/java/org/sonar/plugins/python/PythonExtensions.java index b81e376251..b66978e919 100644 --- a/python-commons/src/main/java/org/sonar/plugins/python/PythonExtensions.java +++ b/python-commons/src/main/java/org/sonar/plugins/python/PythonExtensions.java @@ -16,6 +16,7 @@ */ package org.sonar.plugins.python; +import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.Plugin; @@ -23,7 +24,6 @@ import org.sonar.api.SonarProduct; import org.sonar.api.SonarRuntime; import org.sonar.api.config.PropertyDefinition; -import org.sonar.api.resources.Qualifiers; import org.sonar.plugins.python.api.SonarLintCache; import org.sonar.plugins.python.bandit.BanditRulesDefinition; import org.sonar.plugins.python.bandit.BanditSensor; @@ -68,7 +68,7 @@ static void addCoberturaExtensions(Plugin.Context context) { "The reports have to conform to the Cobertura XML format.") .category(PYTHON_CATEGORY) .subCategory(TEST_AND_COVERAGE) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .defaultValue(PythonCoverageSensor.DEFAULT_REPORT_PATH) .multiValues(true) .build(), @@ -80,7 +80,7 @@ static void addCoberturaExtensions(Plugin.Context context) { "Path to a coverage report. Ant patterns are accepted for relative path. The report has to conform to the Cobertura XML format.") .category(PYTHON_CATEGORY) .subCategory(TEST_AND_COVERAGE) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .defaultValue("") .build(), PythonCoverageSensor.class); @@ -95,7 +95,7 @@ static void addXUnitExtensions(Plugin.Context context) { "are not found. Disabled by default.") .category(PYTHON_CATEGORY) .subCategory(TEST_AND_COVERAGE) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .defaultValue("false") .type(PropertyType.BOOLEAN) .build(), @@ -106,7 +106,7 @@ static void addXUnitExtensions(Plugin.Context context) { "conform to the junitreport XML format.") .category(PYTHON_CATEGORY) .subCategory(TEST_AND_COVERAGE) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .defaultValue(PythonXUnitSensor.DEFAULT_REPORT_PATH) .build(), PythonXUnitSensor.class); @@ -119,7 +119,7 @@ static void addBanditExtensions(Plugin.Context context) { .description("Paths (absolute or relative) to json files with Bandit issues.") .category(EXTERNAL_ANALYZERS_CATEGORY) .subCategory(PYTHON_CATEGORY) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .multiValues(true) .build(), BanditRulesDefinition.class); @@ -132,7 +132,7 @@ static void addPylintExtensions(Plugin.Context context) { .description("Paths (absolute or relative) to report files with Pylint issues.") .category(EXTERNAL_ANALYZERS_CATEGORY) .subCategory(PYTHON_CATEGORY) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .multiValues(true) .build(), PylintRulesDefinition.class); @@ -145,7 +145,7 @@ static void addFlake8Extensions(Plugin.Context context) { .description("Paths (absolute or relative) to report files with Flake8 issues.") .category(EXTERNAL_ANALYZERS_CATEGORY) .subCategory(PYTHON_CATEGORY) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .multiValues(true) .build(), Flake8RulesDefinition.class); @@ -158,7 +158,7 @@ static void addMypyExtensions(Plugin.Context context) { .description("Paths (absolute or relative) to report files with Mypy issues.") .category(EXTERNAL_ANALYZERS_CATEGORY) .subCategory(PYTHON_CATEGORY) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .multiValues(true) .build(), MypyRulesDefinition.class); @@ -171,7 +171,7 @@ static void addRuffExtensions(Plugin.Context context) { .description("Paths (absolute or relative) to report files with Ruff issues.") .category(EXTERNAL_ANALYZERS_CATEGORY) .subCategory(PYTHON_CATEGORY) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .multiValues(true) .build(), RuffRulesDefinition.class); @@ -185,7 +185,7 @@ static PropertyDefinition buildPythonVersion() { .multiValues(true) .category(PYTHON_CATEGORY) .subCategory(GENERAL) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .build(); } @@ -197,7 +197,7 @@ static PropertyDefinition buildIpynbPythonSuffix() { .multiValues(true) .category(PYTHON_CATEGORY) .subCategory(GENERAL) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .defaultValue("ipynb") .build(); } @@ -210,7 +210,7 @@ static PropertyDefinition buildPythonSuffix() { .multiValues(true) .category(PYTHON_CATEGORY) .subCategory(GENERAL) - .onQualifiers(Qualifiers.PROJECT) + .onConfigScopes(Set.of(PropertyDefinition.ConfigScope.PROJECT)) .defaultValue("py") .build(); }