Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade SonarQube minimum version to 9.9 #87

Merged
merged 4 commits into from
Apr 18, 2024
Merged

Upgrade SonarQube minimum version to 9.9 #87

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15572e1
Cleaning & Upgrading dependencies
gaelfoppolo Mar 15, 2024
215615d
Update README
gaelfoppolo Apr 5, 2024
3545238
Remove this use of "Logger"; it is deprecated.
gaelfoppolo Apr 5, 2024
e126f74
Fix SonarLint issues
gaelfoppolo Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 8 additions & 8 deletions commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@

<artifactId>commons</artifactId>

<dependencies>
<properties>
<!-- versions -->
<antlr.version>4.13.0</antlr.version>
<jackson.version>2.17.0</jackson.version>
</properties>

<dependency>
<groupId>com.fasterxml.staxmate</groupId>
<artifactId>staxmate</artifactId>
<version>2.4.0</version>
</dependency>
<dependencies>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.13.0</version>
<version>${antlr.version}</version>
</dependency>

<!-- Jackson: Java to JSON conversion -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4</version>
<version>${jackson.version}</version>
</dependency>

</dependencies>
Expand Down
9 changes: 4 additions & 5 deletions commons/src/main/java/fr/insideapp/sonarqube/apple/commons/issues/ReportIssueRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,24 @@
*/
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;
import org.sonar.api.batch.fs.InputFile;
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;
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<ReportIssue> issues, String repository, SensorContext sensorContext) {

Expand All @@ -51,7 +50,7 @@ public void recordIssues(List<ReportIssue> 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();
Expand Down
61 changes: 38 additions & 23 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,33 +88,42 @@
<license.mailto>contact@insideapp.fr</license.mailto>

<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<jdk.min.version>1.9</jdk.min.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<sonar.apiVersion>7.9</sonar.apiVersion>
<sonar.sources>src/main/java,src/main/js</sonar.sources>
<!-- we depend on API ${sonar.version} but we keep backward compatibility with LTS -->
<pluginApiMinVersion>9.9</pluginApiMinVersion>

<!-- versions -->
<sonar.api.version>10.5.0.2090</sonar.api.version>
<sonar.version>9.9.1.69595</sonar.version>
<sonar-analyzer-commons.version>2.7.0.1482</sonar-analyzer-commons.version>
<sslr.version>1.24.0.633</sslr.version>
<commons.io.version>2.15.1</commons.io.version>
<apache-commons-lang3.version>3.14.0</apache-commons-lang3.version>
<guava.version>33.1.0-jre</guava.version>
<jproc.version>2.8.2</jproc.version>
<junit.version>5.8.2</junit.version>
<assertj.version>3.25.3</assertj.version>
<mockito.version>5.11.0</mockito.version>

<apache-commons.version>2.6</apache-commons.version>
<apache-commons-lang3.version>3.12.0</apache-commons-lang3.version>
<analyzer-commons.version>1.24.0.965</analyzer-commons.version>
<sslr.version>1.23</sslr.version>
<sslr-squid-bridge.version>2.7.1.392</sslr-squid-bridge.version>
<guava.version>17.0</guava.version>
<jproc.version>2.8.0</jproc.version>
<!-- Advertise minimal required JRE version -->
<jre.min.version>11</jre.min.version>

<junit.version>4.11</junit.version>
<assertj.version>3.22.0</assertj.version>
<mockito.version>4.4.0</mockito.version>
<!-- JDK Build versions -->
<jdk.min.version>17</jdk.min.version>
<jdk.source.version>17</jdk.source.version>
<jdk.target.version>17</jdk.target.version>

<sonar.sources>src/main/java,src/main/js</sonar.sources>
<sonar.exclusions>file:**/src/main/java/**/generated/**/*.java</sonar.exclusions>

</properties>

<dependencies>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<groupId>org.sonarsource.api.plugin</groupId>
<artifactId>sonar-plugin-api</artifactId>
<version>${sonar.apiVersion}</version>
<version>${sonar.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -125,17 +134,17 @@
<dependency>
<groupId>org.sonarsource.analyzer-commons</groupId>
<artifactId>sonar-analyzer-test-commons</artifactId>
<version>${analyzer-commons.version}</version>
<version>${sonar-analyzer-commons.version}</version>
</dependency>
<dependency>
<groupId>org.sonarsource.analyzer-commons</groupId>
<artifactId>sonar-analyzer-commons</artifactId>
<version>${analyzer-commons.version}</version>
<version>${sonar-analyzer-commons.version}</version>
</dependency>
<dependency>
<groupId>org.sonarsource.analyzer-commons</groupId>
<artifactId>sonar-xml-parsing</artifactId>
<version>${analyzer-commons.version}</version>
<version>${sonar-analyzer-commons.version}</version>
</dependency>

<dependency>
Expand All @@ -155,15 +164,21 @@
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-plugin-api-impl</artifactId>
<version>${sonar.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-testing-harness</artifactId>
<version>${sonar.apiVersion}</version>
<version>${sonar.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -182,7 +197,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${apache-commons.version}</version>
<version>${commons.io.version}</version>
</dependency>

</dependencies>
Expand All @@ -206,7 +221,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>0.8.8</version>
<configuration>
<excludes>
<exclude>**/generated/**</exclude>
Expand Down
12 changes: 10 additions & 2 deletions sonar-apple-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@

<packaging>sonar-plugin</packaging>

<properties>
<!-- versions -->
<sonar-maven-plugin.version>1.23.0.740</sonar-maven-plugin.version>
<maven-antrun.version>3.1.0</maven-antrun.version>
</properties>

<dependencies>

<dependency>
Expand All @@ -55,18 +61,20 @@
<plugin>
<groupId>org.sonarsource.sonar-packaging-maven-plugin</groupId>
<artifactId>sonar-packaging-maven-plugin</artifactId>
<version>1.21.0.505</version>
<version>${sonar-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<pluginKey>sonar-apple</pluginKey>
<pluginClass>fr.insideapp.sonarqube.apple.ApplePlugin</pluginClass>
<pluginName>Swift/Objective-C Code Quality and Security</pluginName>
<pluginApiMinVersion>${pluginApiMinVersion}</pluginApiMinVersion>
<jreMinVersion>${jre.min.version}</jreMinVersion>
</configuration>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.0.0</version>
<version>${maven-antrun.version}</version>
<executions>
<execution>
<id>deploy</id>
Expand Down