From aa0fef7dd3747c2f2d7ac3790fd52fce104644db Mon Sep 17 00:00:00 2001
From: Jonah Jeleniewski <jjeleniewski@integradev.com.au>
Date: Mon, 25 Sep 2023 16:16:14 +1000
Subject: [PATCH] Update minimum SonarQube version to 9.9

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.
---
 delphi-checks-testkit/pom.xml            |  7 ++++++-
 delphi-checks/pom.xml                    |  2 +-
 delphi-frontend/pom.xml                  |  7 ++++++-
 docs/CUSTOM_RULES_101.md                 |  2 +-
 docs/delphi-custom-rules-example/pom.xml |  8 ++++----
 pom.xml                                  | 15 +++++++++++----
 sonar-delphi-plugin/pom.xml              | 10 +++++++---
 7 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/delphi-checks-testkit/pom.xml b/delphi-checks-testkit/pom.xml
index bd7130d7c..7efec712a 100644
--- a/delphi-checks-testkit/pom.xml
+++ b/delphi-checks-testkit/pom.xml
@@ -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>
diff --git a/delphi-checks/pom.xml b/delphi-checks/pom.xml
index bf475ac9b..7e8c5e32e 100644
--- a/delphi-checks/pom.xml
+++ b/delphi-checks/pom.xml
@@ -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>
 
diff --git a/delphi-frontend/pom.xml b/delphi-frontend/pom.xml
index 14c4b5e2b..4e0c3f08a 100644
--- a/delphi-frontend/pom.xml
+++ b/delphi-frontend/pom.xml
@@ -16,7 +16,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
+      <groupId>org.sonarsource.api.plugin</groupId>
       <artifactId>sonar-plugin-api</artifactId>
     </dependency>
     <dependency>
@@ -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>
diff --git a/docs/CUSTOM_RULES_101.md b/docs/CUSTOM_RULES_101.md
index 5459127fb..416f5ceaa 100644
--- a/docs/CUSTOM_RULES_101.md
+++ b/docs/CUSTOM_RULES_101.md
@@ -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>
diff --git a/docs/delphi-custom-rules-example/pom.xml b/docs/delphi-custom-rules-example/pom.xml
index 2f34050d9..4ae980d8c 100644
--- a/docs/delphi-custom-rules-example/pom.xml
+++ b/docs/delphi-custom-rules-example/pom.xml
@@ -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>
@@ -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>
 
@@ -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>
diff --git a/pom.xml b/pom.xml
index bd5394b80..f5275125d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/sonar-delphi-plugin/pom.xml b/sonar-delphi-plugin/pom.xml
index 83c6c9372..85111151a 100644
--- a/sonar-delphi-plugin/pom.xml
+++ b/sonar-delphi-plugin/pom.xml
@@ -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>
@@ -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>
@@ -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>