Update sonar-plugin-api

Author: saberduck

its/plugin/pom.xml

@@ -31,6 +31,12 @@
       <version>${analyzerCommons.version}</version>
        <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarqube</groupId>
+      <artifactId>sonar-ws</artifactId>
+      <version>${sonarqube.sonar.ws.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarlint.core</groupId>
       <artifactId>sonarlint-core</artifactId>
@@ -43,12 +49,6 @@
       <version>${orchestrator.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
-      <artifactId>sonar-ws</artifactId>
-      <version>${sonarqube.sonar.ws.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

pom.xml

@@ -66,11 +66,11 @@
     <jakarta.el.version>4.0.2</jakarta.el.version>
     <sslr.version>1.24.0.633</sslr.version>
     <analyzerCommons.version>2.5.0.1358</analyzerCommons.version>
-    <sonar.plugin.api.version>7.9</sonar.plugin.api.version>
+    <sonar.plugin.api.version>10.1.0.809</sonar.plugin.api.version>
 
     <sonarlint.api.impl.version>6.3.0.36253</sonarlint.api.impl.version>
-    <sonarqube.api.impl.version>9.9.0.65466</sonarqube.api.impl.version>
-    <sonarqube.sonar.ws.version>9.9.0.65466</sonarqube.sonar.ws.version>
+    <sonarqube.api.impl.version>10.1.0.73491</sonarqube.api.impl.version>
+    <sonarqube.sonar.ws.version>10.1.0.73491</sonarqube.sonar.ws.version>
     <orchestrator.version>3.40.0.183</orchestrator.version>
     <junit.version>4.13.2</junit.version>
     <assertj.version>3.23.1</assertj.version>

sonar-html-plugin/pom.xml

@@ -39,7 +39,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
+      <groupId>org.sonarsource.api.plugin</groupId>
       <artifactId>sonar-plugin-api</artifactId>
       <version>${sonar.plugin.api.version}</version>
       <scope>provided</scope>
@@ -121,6 +121,14 @@
           </exclusion>
         </exclusions>
     </dependency>
+
+     <dependency>
+        <groupId>org.sonarsource.api.plugin</groupId>
+        <artifactId>sonar-plugin-api-test-fixtures</artifactId>
+        <version>${sonar.plugin.api.version}</version>
+        <scope>test</scope>
+      </dependency>
+
   </dependencies>
 
 
@@ -150,6 +158,9 @@
           <!-- SonarHTML replaces SonarWeb but we keep the plugin key "web" to make it easier for users to migrate -->
           <pluginKey>web</pluginKey>
           <jreMinVersion>${jdk.min.version}</jreMinVersion>
+          <!-- this value is translated to Sonar-Version property in META-INF/MANIFEST.MF file inside jar. It is used at runtime
+          by products to detect compatibility. We keep LTS -->
+          <sonarQubeMinVersion>9.9</sonarQubeMinVersion>
         </configuration>
       </plugin>
 

sonar-html-plugin/src/main/java/org/sonar/plugins/html/core/HtmlSensor.java

@@ -89,12 +89,7 @@ private void processesFilesIndependently(SensorDescriptor descriptor) {
       || !sonarRuntime.getApiVersion().isGreaterThanOrEqual(Version.create(9, 3))) {
       return;
     }
-    try {
-      Method method = descriptor.getClass().getMethod("processesFilesIndependently");
-      method.invoke(descriptor);
-    } catch (ReflectiveOperationException e) {
-      LOG.warn("Could not call SensorDescriptor.processesFilesIndependently() method", e);
-    }
+    descriptor.processesFilesIndependently();
   }
 
   @Override

sonar-html-plugin/src/test/java/org/sonar/plugins/html/core/HtmlSensorTest.java

@@ -50,8 +50,8 @@
 import org.sonar.api.measures.FileLinesContextFactory;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.server.rule.RulesDefinition;
+import org.sonar.api.testfixtures.log.LogTesterJUnit5;
 import org.sonar.api.utils.Version;
-import org.sonar.api.utils.log.LogTesterJUnit5;
 import org.sonar.plugins.html.api.HtmlConstants;
 import org.sonar.plugins.html.rules.HtmlRulesDefinition;
 
@@ -190,15 +190,6 @@ public SensorDescriptor processesFilesIndependently() {
     assertTrue(called[0]);
   }
 
-  @Test
-  public void test_descriptor_sonarqube_9_3_reflection_failure() {
-    DefaultSensorDescriptor sensorDescriptor = new DefaultSensorDescriptor();
-    SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(9, 3), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY);
-    new HtmlSensor(sonarRuntime, null, null, new CheckFactory(new DefaultActiveRules(Collections.emptyList()))).describe(sensorDescriptor);
-    assertThat(sensorDescriptor.name()).isEqualTo("HTML");
-    assertThat(sensorDescriptor.languages()).isEmpty();
-    assertTrue(logTester.logs().contains("Could not call SensorDescriptor.processesFilesIndependently() method"));
-  }
 
   @Test
   public void php_file_should_not_have_metrics() {

sonar-html-plugin/src/test/java/org/sonar/plugins/html/rules/HtmlRulesDefinitionTest.java

@@ -41,7 +41,7 @@ public void test() {
     rulesDefinition.define(context);
     RulesDefinition.Repository repository = context.repository("Web");
 
-    assertThat(repository.name()).isEqualTo("SonarAnalyzer");
+    assertThat(repository.name()).isEqualTo("Sonar");
     assertThat(repository.language()).isEqualTo("web");
     assertThat(repository.rules()).hasSize(CheckClasses.getCheckClasses().size());