From 15572e15a5e4c16bf377b00dc8fc887505494db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88l=20Foppolo?= Date: Fri, 15 Mar 2024 18:06:56 +0100 Subject: [PATCH 1/4] Cleaning & Upgrading dependencies --- commons/pom.xml | 16 ++--- .../commons/issues/ReportIssueRecorder.java | 3 +- pom.xml | 61 ++++++++++++------- sonar-apple-plugin/pom.xml | 12 +++- 4 files changed, 57 insertions(+), 35 deletions(-) diff --git a/commons/pom.xml b/commons/pom.xml index 33c62042..a4d203d0 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -28,25 +28,25 @@ commons - + + + 4.13.0 + 2.17.0 + - - com.fasterxml.staxmate - staxmate - 2.4.0 - + org.antlr antlr4-runtime - 4.13.0 + ${antlr.version} com.fasterxml.jackson.core jackson-databind - 2.13.4 + ${jackson.version} diff --git a/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java b/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java index f01e3ba6..121dfeb2 100644 --- a/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java +++ b/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java @@ -24,7 +24,6 @@ import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.batch.sensor.issue.NewIssue; import org.sonar.api.batch.sensor.issue.NewIssueLocation; -import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation; import org.sonar.api.rule.RuleKey; import org.sonar.api.scanner.ScannerSide; import org.sonar.api.utils.log.Logger; @@ -51,7 +50,7 @@ public void recordIssues(List issues, String repository, SensorCont .newIssue() .forRule(RuleKey.of(repository, issue.getRuleId())); // The location of the issue to be record - NewIssueLocation sonarIssueLocation = new DefaultIssueLocation(); + NewIssueLocation sonarIssueLocation = sonarIssue.newLocation(); // Adding message if any String message = issue.getMessage(); diff --git a/pom.xml b/pom.xml index 69d861e7..35b06e95 100644 --- a/pom.xml +++ b/pom.xml @@ -88,33 +88,42 @@ contact@insideapp.fr true - 1.9 UTF-8 - 7.9 - src/main/java,src/main/js + + 9.9 + + + 10.5.0.2090 + 9.9.1.69595 + 2.7.0.1482 + 1.24.0.633 + 2.15.1 + 3.14.0 + 33.1.0-jre + 2.8.2 + 5.8.2 + 3.25.3 + 5.11.0 - 2.6 - 3.12.0 - 1.24.0.965 - 1.23 - 2.7.1.392 - 17.0 - 2.8.0 + + 11 - 4.11 - 3.22.0 - 4.4.0 + + 17 + 17 + 17 + src/main/java,src/main/js file:**/src/main/java/**/generated/**/*.java - org.sonarsource.sonarqube + org.sonarsource.api.plugin sonar-plugin-api - ${sonar.apiVersion} + ${sonar.api.version} provided @@ -125,17 +134,17 @@ org.sonarsource.analyzer-commons sonar-analyzer-test-commons - ${analyzer-commons.version} + ${sonar-analyzer-commons.version} org.sonarsource.analyzer-commons sonar-analyzer-commons - ${analyzer-commons.version} + ${sonar-analyzer-commons.version} org.sonarsource.analyzer-commons sonar-xml-parsing - ${analyzer-commons.version} + ${sonar-analyzer-commons.version} @@ -155,15 +164,21 @@ + + org.sonarsource.sonarqube + sonar-plugin-api-impl + ${sonar.version} + test + org.sonarsource.sonarqube sonar-testing-harness - ${sonar.apiVersion} + ${sonar.version} test - junit - junit + org.junit.jupiter + junit-jupiter-api ${junit.version} test @@ -182,7 +197,7 @@ commons-io commons-io - ${apache-commons.version} + ${commons.io.version} @@ -206,7 +221,7 @@ org.jacoco jacoco-maven-plugin - 0.8.5 + 0.8.8 **/generated/** diff --git a/sonar-apple-plugin/pom.xml b/sonar-apple-plugin/pom.xml index 81a371e8..4973994b 100644 --- a/sonar-apple-plugin/pom.xml +++ b/sonar-apple-plugin/pom.xml @@ -32,6 +32,12 @@ sonar-plugin + + + 1.23.0.740 + 3.1.0 + + @@ -55,18 +61,20 @@ org.sonarsource.sonar-packaging-maven-plugin sonar-packaging-maven-plugin - 1.21.0.505 + ${sonar-maven-plugin.version} true sonar-apple fr.insideapp.sonarqube.apple.ApplePlugin Swift/Objective-C Code Quality and Security + ${pluginApiMinVersion} + ${jre.min.version} maven-antrun-plugin - 3.0.0 + ${maven-antrun.version} deploy From 215615d5253bc25c7317658f08f94b134305ff28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88l=20Foppolo?= Date: Fri, 5 Apr 2024 17:01:15 +0200 Subject: [PATCH 2/4] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 769892d9..fd0daec1 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ The plugin is designed to support Swift 5 syntax. ### Server-side -SonarQube 7.9+ is required. +SonarQube 9.9+ is required. - Download the plugin binary into the ``$SONARQUBE_HOME/extensions/plugins`` directory. - Restart the server. From 3545238dd2ebdd26e39a01f437f5409a173ffacc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88l=20Foppolo?= Date: Fri, 5 Apr 2024 17:19:43 +0200 Subject: [PATCH 3/4] Remove this use of "Logger"; it is deprecated. --- .../sonarqube/apple/commons/issues/ReportIssueRecorder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java b/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java index 121dfeb2..909461da 100644 --- a/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java +++ b/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java @@ -17,6 +17,8 @@ */ package fr.insideapp.sonarqube.apple.commons.issues; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.FilePredicate; import org.sonar.api.batch.fs.FilePredicates; import org.sonar.api.batch.fs.FileSystem; @@ -26,15 +28,13 @@ import org.sonar.api.batch.sensor.issue.NewIssueLocation; import org.sonar.api.rule.RuleKey; import org.sonar.api.scanner.ScannerSide; -import org.sonar.api.utils.log.Logger; -import org.sonar.api.utils.log.Loggers; import java.util.List; @ScannerSide public final class ReportIssueRecorder { - private static final Logger LOGGER = Loggers.get(ReportIssueRecorder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ReportIssueRecorder.class); public void recordIssues(List issues, String repository, SensorContext sensorContext) { From e126f749c56db56b0cbeb5f46bfa57b837c2da17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gae=CC=88l=20Foppolo?= Date: Thu, 18 Apr 2024 16:31:34 +0200 Subject: [PATCH 4/4] Fix SonarLint issues --- .../sonarqube/apple/commons/antlr/ParseTreeAnalyzer.java | 6 +++--- .../apple/commons/issues/ReportIssueRecorderTest.java | 2 +- .../xcode/coverage/recorder/XcodeCoverageRecorder.java | 6 +++--- .../sonarqube/apple/xcode/tests/XcodeTestsSensor.java | 2 +- .../apple/xcode/tests/recorder/XcodeTestsRecorder.java | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/antlr/ParseTreeAnalyzer.java b/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/antlr/ParseTreeAnalyzer.java index 4e6a0931..429e5f83 100644 --- a/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/antlr/ParseTreeAnalyzer.java +++ b/commons/src/main/java/fr/insideapp/sonarqube/apple/commons/antlr/ParseTreeAnalyzer.java @@ -17,19 +17,19 @@ */ package fr.insideapp.sonarqube.apple.commons.antlr; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.FilePredicate; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.fs.InputFile.Type; import org.sonar.api.batch.sensor.SensorContext; -import org.sonar.api.utils.log.Logger; -import org.sonar.api.utils.log.Loggers; import java.io.IOException; import java.nio.charset.Charset; public class ParseTreeAnalyzer { - private static final Logger LOGGER = Loggers.get(ParseTreeAnalyzer.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ParseTreeAnalyzer.class); private final String languageKey; private final Type type; diff --git a/commons/src/test/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorderTest.java b/commons/src/test/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorderTest.java index cf64cee8..ef92bbde 100644 --- a/commons/src/test/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorderTest.java +++ b/commons/src/test/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorderTest.java @@ -125,7 +125,7 @@ public void record_issue_on_file_not_included() { recorder.recordIssues(List.of(reportIssue), "TestRepo", context); // assert final List issues = new ArrayList<>(context.allIssues()); - assertThat(issues).hasSize(0); + assertThat(issues).isEmpty(); } @Test diff --git a/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/coverage/recorder/XcodeCoverageRecorder.java b/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/coverage/recorder/XcodeCoverageRecorder.java index 4db309c0..83f815d0 100644 --- a/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/coverage/recorder/XcodeCoverageRecorder.java +++ b/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/coverage/recorder/XcodeCoverageRecorder.java @@ -19,20 +19,20 @@ import fr.insideapp.sonarqube.apple.xcode.coverage.models.XcodeCodeCoverage; import fr.insideapp.sonarqube.apple.xcode.coverage.models.XcodeCodeCoverageMetadata; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.FilePredicate; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.batch.sensor.coverage.NewCoverage; import org.sonar.api.scanner.ScannerSide; -import org.sonar.api.utils.log.Logger; -import org.sonar.api.utils.log.Loggers; import java.util.List; @ScannerSide public final class XcodeCoverageRecorder implements XcodeCoverageRecordable { - private static final Logger LOGGER = Loggers.get(XcodeCoverageRecorder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XcodeCoverageRecorder.class); private final SensorContext context; diff --git a/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/XcodeTestsSensor.java b/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/XcodeTestsSensor.java index 6221e440..a625c99e 100644 --- a/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/XcodeTestsSensor.java +++ b/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/XcodeTestsSensor.java @@ -97,7 +97,7 @@ public void execute(SensorContext sensorContext) { .map(parser::parse) .map(mapper::map) .flatMap(Collection::stream) - .collect(Collectors.toList()); + .toList(); recorder.save(testSummaries, sensorContext); } diff --git a/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/recorder/XcodeTestsRecorder.java b/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/recorder/XcodeTestsRecorder.java index 86b630a5..88117b11 100644 --- a/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/recorder/XcodeTestsRecorder.java +++ b/sonar-apple-plugin/src/main/java/fr/insideapp/sonarqube/apple/xcode/tests/recorder/XcodeTestsRecorder.java @@ -21,13 +21,13 @@ import fr.insideapp.sonarqube.apple.xcode.tests.models.XcodeTestSummary; import fr.insideapp.sonarqube.apple.xcode.tests.models.XcodeTestClassReport; import fr.insideapp.sonarqube.apple.xcode.tests.models.XcodeTestGroup; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.sensor.SensorContext; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.api.scanner.ScannerSide; -import org.sonar.api.utils.log.Logger; -import org.sonar.api.utils.log.Loggers; import javax.annotation.CheckForNull; import java.io.Serializable; @@ -42,7 +42,7 @@ public XcodeTestsRecorder(final XcodeTestFileFindable finder) { this.finder = finder; } - private static final Logger LOGGER = Loggers.get(XcodeTestsRecorder.class); + private static final Logger LOGGER = LoggerFactory.getLogger(XcodeTestsRecorder.class); @Override public void save(List testSummaries, SensorContext context) {