Skip to content

Commit f561c3d

Browse files
alban-auzeillalban-auzeill
authored
SONARKT-356 CCT support using sonar-analyzer-commons 2.7 and sonar-plugin-api 10.1 (#363)
1 parent bac4c57 commit f561c3d

File tree

10 files changed

+26
-14
lines changed

10 files changed

+26
-14
lines changed

‎settings.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ dependencyResolutionManagement {
3636
versionCatalogs {
3737

3838
val kotlinVersion: String by extra
39-
val analyzerCommonsVersionStr = "2.5.0.1358"
40-
val sonarPluginApi = "9.15.0.435"
39+
val analyzerCommonsVersionStr = "2.7.0.1482"
40+
val sonarPluginApi = "10.1.0.809"
41+
val slf4jApi = "1.7.30"
4142

4243
create("libs") {
4344
val analyzerCommons = version("analyzerCommons", analyzerCommonsVersionStr)
@@ -51,6 +52,7 @@ dependencyResolutionManagement {
5152
library("sonar-analyzer-commons-recognizers", "org.sonarsource.analyzer-commons", "sonar-analyzer-recognizers").versionRef(analyzerCommons)
5253
library("sonar-performance-measure", "org.sonarsource.analyzer-commons", "sonar-performance-measure").versionRef(analyzerCommons)
5354
library("sonar-plugin-api", "org.sonarsource.api.plugin", "sonar-plugin-api").version(sonarPluginApi)
55+
library("slf4j-api", "org.slf4j", "slf4j-api").version(slf4jApi)
5456
library("sonar-regex-parsing", "org.sonarsource.analyzer-commons", "sonar-regex-parsing").versionRef(analyzerCommons)
5557
library("sonar-xml-parsing", "org.sonarsource.analyzer-commons", "sonar-xml-parsing").versionRef(analyzerCommons)
5658
library("staxmate", "com.fasterxml.staxmate", "staxmate").versionRef(staxmate)

‎sonar-kotlin-api/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44

55
dependencies {
66
compileOnly(libs.sonar.plugin.api)
7+
compileOnly(libs.slf4j.api)
78
implementation(libs.sonar.analyzer.commons)
89
implementation(libs.sonar.xml.parsing)
910
implementation(libs.sonar.regex.parsing)
@@ -13,6 +14,7 @@ dependencies {
1314
implementation(libs.gson)
1415
implementation(libs.sonar.analyzer.commons.recognizers)
1516

17+
testImplementation(libs.slf4j.api)
1618
testImplementation(testLibs.junit.api)
1719
testImplementation(testLibs.junit.params)
1820
testRuntimeOnly(testLibs.junit.engine)

‎sonar-kotlin-external-linters/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44

55
dependencies {
66
compileOnly(libs.sonar.plugin.api)
7+
compileOnly(libs.slf4j.api)
78
implementation(libs.sonar.analyzer.commons)
89
implementation(libs.sonar.xml.parsing)
910
implementation(libs.sonar.regex.parsing)
@@ -15,6 +16,7 @@ dependencies {
1516

1617
implementation(project(":sonar-kotlin-api"))
1718

19+
testImplementation(libs.slf4j.api)
1820
testImplementation(testLibs.junit.api)
1921
testImplementation(testLibs.junit.params)
2022
testRuntimeOnly(testLibs.junit.engine)

‎sonar-kotlin-external-linters/src/test/java/org/sonarsource/kotlin/externalreport/common/CheckstyleFormatImporterWithRuleLoaderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import kotlin.jvm.JvmField;
2727
import org.junit.jupiter.api.Test;
2828
import org.junit.jupiter.api.extension.RegisterExtension;
29+
import org.slf4j.event.Level;
2930
import org.sonar.api.batch.rule.Severity;
3031
import org.sonar.api.batch.sensor.internal.SensorContextTester;
3132
import org.sonar.api.batch.sensor.issue.ExternalIssue;
3233
import org.sonar.api.rules.RuleType;
3334
import org.sonar.api.testfixtures.log.LogTesterJUnit5;
34-
import org.sonar.api.utils.log.LoggerLevel;
3535
import org.sonarsource.analyzer.commons.ExternalRuleLoader;
3636

3737
import static org.assertj.core.api.Assertions.assertThat;
@@ -77,7 +77,7 @@ void import_detekt_issues_with_rule_loader() throws IOException {
7777
assertThat(third.primaryLocation().message()).isEqualTo("A class should always override hashCode when overriding equals and the other way around.");
7878
assertThat(third.primaryLocation().textRange().start().line()).isEqualTo(3);
7979

80-
assertThat(logTester.logs(LoggerLevel.ERROR)).isEmpty();
80+
assertThat(logTester.logs(Level.ERROR)).isEmpty();
8181
}
8282

8383
private List<ExternalIssue> importIssues(String fileName) throws IOException {

‎sonar-kotlin-gradle/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ repositories {
88

99
dependencies {
1010
compileOnly(libs.sonar.plugin.api)
11+
compileOnly(libs.slf4j.api)
1112
implementation(libs.sonar.analyzer.commons)
1213
implementation(libs.sonar.xml.parsing)
1314
implementation(libs.sonar.regex.parsing)
@@ -21,6 +22,7 @@ dependencies {
2122
implementation(project(":sonar-kotlin-api"))
2223
implementation(project(":sonar-kotlin-surefire"))
2324

25+
testImplementation(libs.slf4j.api)
2426
testImplementation(testLibs.junit.api)
2527
testImplementation(testLibs.junit.params)
2628
testRuntimeOnly(testLibs.junit.engine)

‎sonar-kotlin-plugin/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ repositories {
1414

1515
dependencies {
1616
compileOnly(libs.sonar.plugin.api)
17+
compileOnly(libs.slf4j.api)
1718
implementation(libs.sonar.analyzer.commons)
1819
implementation(libs.sonar.xml.parsing)
1920
implementation(libs.sonar.regex.parsing)
@@ -30,6 +31,7 @@ dependencies {
3031
implementation(project(":sonar-kotlin-surefire"))
3132
implementation(project(":sonar-kotlin-checks"))
3233

34+
testImplementation(libs.slf4j.api)
3335
testImplementation(testLibs.junit.api)
3436
testImplementation(testLibs.junit.params)
3537
testRuntimeOnly(testLibs.junit.engine)

‎sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinRulesDefinitionTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal class KotlinRulesDefinitionTest {
3434
@Test
3535
fun rules() {
3636
val repository = repositoryForVersion(Version.create(8, 9))
37-
Assertions.assertThat(repository!!.name()).isEqualTo("SonarQube")
37+
Assertions.assertThat(repository!!.name()).isEqualTo("Sonar")
3838
Assertions.assertThat(repository.language()).isEqualTo("kotlin")
3939
val rule = repository.rule("S1764")!!
4040
Assertions.assertThat(rule.name())

‎sonar-kotlin-surefire/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44

55
dependencies {
66
compileOnly(libs.sonar.plugin.api)
7+
compileOnly(libs.slf4j.api)
78
implementation(libs.sonar.analyzer.commons)
89
implementation(libs.sonar.xml.parsing)
910
implementation(libs.sonar.regex.parsing)
@@ -15,6 +16,7 @@ dependencies {
1516

1617
implementation(project(":sonar-kotlin-api"))
1718

19+
testImplementation(libs.slf4j.api)
1820
testImplementation(testLibs.junit.api)
1921
testImplementation(testLibs.junit.params)
2022
testRuntimeOnly(testLibs.junit.engine)

‎sonar-kotlin-surefire/src/test/java/org/sonarsource/kotlin/surefire/KotlinSurefireParserTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;
3131
import org.junit.jupiter.api.extension.RegisterExtension;
32+
import org.slf4j.event.Level;
3233
import org.sonar.api.batch.fs.FileSystem;
3334
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
3435
import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
3536
import org.sonar.api.batch.sensor.SensorContext;
3637
import org.sonar.api.batch.sensor.internal.SensorContextTester;
3738
import org.sonar.api.measures.CoreMetrics;
3839
import org.sonar.api.testfixtures.log.LogTesterJUnit5;
39-
import org.sonar.api.utils.log.LoggerLevel;
4040

4141
import static org.assertj.core.api.Assertions.assertThat;
4242
import static org.mockito.ArgumentMatchers.anyString;
@@ -92,9 +92,9 @@ void should_store_zero_tests_when_source_file_is_not_found() {
9292
when(context.fileSystem()).thenReturn(new DefaultFileSystem(Paths.get("/test")));
9393
parser.collect(context, getDirs("multipleReports"), false);
9494
verify(context, never()).newMeasure();
95-
assertThat(logTester.logs(LoggerLevel.WARN)).isNotEmpty();
96-
assertThat(logTester.logs(LoggerLevel.WARN)).allMatch(message -> message.startsWith(PREFIX));
97-
assertThat(logTester.logs(LoggerLevel.WARN)).allMatch(message -> message.endsWith(WARNING));
95+
assertThat(logTester.logs(Level.WARN)).isNotEmpty();
96+
assertThat(logTester.logs(Level.WARN)).allMatch(message -> message.startsWith(PREFIX));
97+
assertThat(logTester.logs(Level.WARN)).allMatch(message -> message.endsWith(WARNING));
9898
}
9999

100100
@Test

‎sonar-kotlin-surefire/src/test/java/org/sonarsource/kotlin/surefire/api/SurefireUtilsTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import kotlin.jvm.JvmField;
2525
import org.junit.jupiter.api.Test;
2626
import org.junit.jupiter.api.extension.RegisterExtension;
27+
import org.slf4j.event.Level;
2728
import org.sonar.api.batch.fs.internal.DefaultFileSystem;
2829
import org.sonar.api.config.internal.MapSettings;
2930
import org.sonar.api.scan.filesystem.PathResolver;
3031
import org.sonar.api.testfixtures.log.LogTesterJUnit5;
31-
import org.sonar.api.utils.log.LoggerLevel;
3232

3333
import static org.assertj.core.api.Assertions.assertThat;
3434

@@ -48,7 +48,7 @@ void should_get_report_paths_from_property() {
4848
DefaultFileSystem fs = new DefaultFileSystem(new File(API_PATH + "SurefireUtilsTest/shouldGetReportsPathFromProperty"));
4949
PathResolver pathResolver = new PathResolver();
5050

51-
assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
51+
assertThat(logTester.logs(Level.INFO)).isEmpty();
5252

5353
List<File> directories = SurefireUtils.getReportsDirectories(settings.asConfig(), fs, pathResolver);
5454

@@ -61,7 +61,7 @@ void should_get_report_paths_from_property() {
6161
assertThat(directory2)
6262
.exists()
6363
.isDirectory();
64-
assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
64+
assertThat(logTester.logs(Level.INFO)).isEmpty();
6565
}
6666

6767
@Test
@@ -70,7 +70,7 @@ void return_default_value_if_property_unset() throws Exception {
7070
DefaultFileSystem fs = new DefaultFileSystem(new File(API_PATH + "SurefireUtilsTest"));
7171
PathResolver pathResolver = new PathResolver();
7272

73-
assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
73+
assertThat(logTester.logs(Level.INFO)).isEmpty();
7474

7575
List<File> directories = SurefireUtils.getReportsDirectories(settings.asConfig(), fs, pathResolver);
7676

@@ -79,6 +79,6 @@ void return_default_value_if_property_unset() throws Exception {
7979
assertThat(directory.getCanonicalPath()).endsWith("target" + File.separator + "surefire-reports");
8080
assertThat(directory).doesNotExist();
8181
assertThat(directory.isDirectory()).isFalse();
82-
assertThat(logTester.logs(LoggerLevel.INFO)).isEmpty();
82+
assertThat(logTester.logs(Level.INFO)).isEmpty();
8383
}
8484
}

0 commit comments

Comments
 (0)