Skip to content

Commit

Permalink
Update minimum SonarQube version to 9.9
Browse files Browse the repository at this point in the history
The plugin is technically compatible as far back as 7.9 on java 11.
Unfortunately, this won't fly on the marketplace because we don't
support java 8, which is expected for LTS versions prior to 9.9.
  • Loading branch information
Cirras committed Sep 25, 2023
1 parent dc66bc9 commit aa0fef7
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 15 deletions.
7 changes: 6 additions & 1 deletion delphi-checks-testkit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,14 @@
</dependency>

<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<groupId>org.sonarsource.api.plugin</groupId>
<artifactId>sonar-plugin-api</artifactId>
</dependency>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-plugin-api-impl</artifactId>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
Expand Down
2 changes: 1 addition & 1 deletion delphi-checks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<artifactId>sonar-analyzer-commons</artifactId>
</dependency>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<groupId>org.sonarsource.api.plugin</groupId>
<artifactId>sonar-plugin-api</artifactId>
</dependency>

Expand Down
7 changes: 6 additions & 1 deletion delphi-frontend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<dependencies>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<groupId>org.sonarsource.api.plugin</groupId>
<artifactId>sonar-plugin-api</artifactId>
</dependency>
<dependency>
Expand Down Expand Up @@ -60,6 +60,11 @@
<artifactId>json-simple</artifactId>
</dependency>

<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-plugin-api-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonarsource.analyzer-commons</groupId>
<artifactId>sonar-analyzer-test-commons</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docs/CUSTOM_RULES_101.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ you rename or move the class implementing `org.sonar.api.Plugin`.
<pluginName>Delphi Custom Rules</pluginName>
<pluginClass>au.com.integradev.samples.delphi.MyDelphiRulesPlugin</pluginClass>
<skipDependenciesPackaging>true</skipDependenciesPackaging>
<sonarQubeMinVersion>${sonarqube.version}</sonarQubeMinVersion>
<sonarQubeMinVersion>9.9</sonarQubeMinVersion>
<requirePlugins>communitydelphi:${sonar.delphi.version}</requirePlugins>
</configuration>
</plugin>
Expand Down
8 changes: 4 additions & 4 deletions docs/delphi-custom-rules-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonarqube.version>7.9</sonarqube.version>
<sonar.delphi.version>0.40.0</sonar.delphi.version>
<sonar.plugin.api.version>9.14.0.375</sonar.plugin.api.version>
<sonar.analyzer.commons.version>2.7.0.1482</sonar.analyzer.commons.version>
<junit.version>5.9.0</junit.version>
<assertj.version>3.23.1</assertj.version>
Expand All @@ -65,9 +65,9 @@

<dependencies>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<groupId>org.sonarsource.api.plugin</groupId>
<artifactId>sonar-plugin-api</artifactId>
<version>${sonarqube.version}</version>
<version>${sonar.plugin.api.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -130,7 +130,7 @@
<pluginName>Delphi Custom Rules</pluginName>
<pluginClass>au.com.integradev.samples.delphi.MyDelphiRulesPlugin</pluginClass>
<skipDependenciesPackaging>true</skipDependenciesPackaging>
<sonarQubeMinVersion>${sonarqube.version}</sonarQubeMinVersion>
<sonarQubeMinVersion>9.9</sonarQubeMinVersion>
<requirePlugins>communitydelphi:${sonar.delphi.version}</requirePlugins>
</configuration>
</plugin>
Expand Down
15 changes: 11 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@
<sonar.issue.ignore.allfile>r1</sonar.issue.ignore.allfile>
<sonar.issue.ignore.allfile.r1.fileRegexp>@(javax\\.annotation\\.)?Generated</sonar.issue.ignore.allfile.r1.fileRegexp>
<!-- Dependency versions -->
<sonar.version>7.9</sonar.version>
<sonarqube.version>9.9.0.65466</sonarqube.version>
<sonar-plugin-api.version>9.14.0.375</sonar-plugin-api.version>
<sonar-analyzer-commons.version>2.7.0.1482</sonar-analyzer-commons.version>
<sonar-orchestrator.version>4.0.0.404</sonar-orchestrator.version>
<antlr-runtime.version>3.5.3</antlr-runtime.version>
Expand Down Expand Up @@ -136,9 +137,9 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<groupId>org.sonarsource.api.plugin</groupId>
<artifactId>sonar-plugin-api</artifactId>
<version>${sonar.version}</version>
<version>${sonar-plugin-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -191,6 +192,12 @@
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
</dependency>
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-plugin-api-impl</artifactId>
<version>${sonarqube.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonarsource.analyzer-commons</groupId>
<artifactId>sonar-analyzer-test-commons</artifactId>
Expand Down Expand Up @@ -230,7 +237,7 @@
<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-ws</artifactId>
<version>${sonar.version}</version>
<version>${sonarqube.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 7 additions & 3 deletions sonar-delphi-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@
</dependency>

<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<groupId>org.sonarsource.api.plugin</groupId>
<artifactId>sonar-plugin-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.sonarsource.analyzer-commons</groupId>
Expand All @@ -64,6 +63,11 @@
<artifactId>jdom2</artifactId>
</dependency>

<dependency>
<groupId>org.sonarsource.sonarqube</groupId>
<artifactId>sonar-plugin-api-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonarsource.analyzer-commons</groupId>
<artifactId>sonar-analyzer-test-commons</artifactId>
Expand Down Expand Up @@ -97,7 +101,7 @@
<pluginName>Delphi</pluginName>
<skipDependenciesPackaging>true</skipDependenciesPackaging>
<pluginClass>au.com.integradev.delphi.DelphiPlugin</pluginClass>
<sonarQubeMinVersion>7.9</sonarQubeMinVersion>
<sonarQubeMinVersion>9.9</sonarQubeMinVersion>
<jreMinVersion>11</jreMinVersion>
</configuration>
</plugin>
Expand Down

0 comments on commit aa0fef7

Please sign in to comment.