Upgrade some versions + sonar version from 9.3 to 9.8

INSTALL.md

@@ -33,6 +33,7 @@ Howto build the SonarQube ecoCode plugins
 
 - Java >= 11
 - Mvn 3
+- SonarQube 9.4 or higher
 
 ### Build the code
 

docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   sonar:
-    image: sonarqube:9.3-community
+    image: sonarqube:9.7-community
     container_name: sonar_standard
     ports:
       - "9000:9000"
@@ -24,12 +24,12 @@ services:
       - type: bind
         source: ./python-plugin/target/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
         target: /opt/sonarqube/extensions/plugins/ecocode-python-plugin-0.1.0-SNAPSHOT.jar
-#      - type: bind
-#        source: ./ecolinter-plugin/target/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-#        target: /opt/sonarqube/extensions/plugins/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
-#      - type: bind
-#        source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
-#        target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
+#     - type: bind
+#       source: ./ecolinter-plugin/target/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
+#       target: /opt/sonarqube/extensions/plugins/ecocode-ecolinter-plugin-0.1.0-SNAPSHOT.jar
+#     - type: bind
+#       source: ./xml-plugin/target/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
+#       target: /opt/sonarqube/extensions/plugins/ecocode-xml-plugin-0.1.0-SNAPSHOT.jar
       - "extensions:/opt/sonarqube/extensions"
       - "logs:/opt/sonarqube/logs"
       - "data:/opt/sonarqube/data"

java-plugin/src/main/java/fr/cnumr/java/MyJavaRulesDefinition.java

@@ -23,7 +23,13 @@
 import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
+
+import org.sonar.api.SonarEdition;
+import org.sonar.api.SonarQubeSide;
+import org.sonar.api.SonarRuntime;
+import org.sonar.api.internal.SonarRuntimeImpl;
 import org.sonar.api.server.rule.RulesDefinition;
+import org.sonar.api.utils.Version;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
 
 /**
@@ -46,7 +52,9 @@ public class MyJavaRulesDefinition implements RulesDefinition {
   public void define(Context context) {
     NewRepository repository = context.createRepository(REPOSITORY_KEY, LANGUAGE).setName(NAME);
 
-    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH);
+    SonarRuntime sonarRuntime = SonarRuntimeImpl.forSonarQube(Version.create(9, 7), SonarQubeSide.SCANNER, SonarEdition.DEVELOPER);
+
+    RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH,sonarRuntime);
 
     ruleMetadataLoader.addRulesByAnnotatedClass(repository, new ArrayList<>(RulesList.getChecks()));
 

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidConcatenateStringsInLoopTest.java

@@ -1,21 +1,21 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 public class AvoidConcatenateStringsInLoopTest {
 
     @Test
     public void checkNonCompliantTests() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidConcatenateStringsInLoop.java")
                 .withCheck(new AvoidConcatenateStringsInLoop())
                 .verifyIssues();
     }
 
     @Test
     public void checkCompliantTests() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/GoodWayConcatenateStringsLoop.java")
                 .withCheck(new AvoidConcatenateStringsInLoop())
                 .verifyNoIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidFullSQLRequestCheckTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidFullSQLRequestCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidFullSQLRequestCheck.java")
                 .withCheck(new AvoidFullSQLRequest())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidGettingSizeCollectionInLoopTest.java

@@ -1,16 +1,16 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidGettingSizeCollectionInLoopTest {
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidGettingSizeCollectionInLoopBad.java")
                 .withCheck(new AvoidGettingSizeCollectionInLoop())
                 .verifyIssues();
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidGettingSizeCollectionInLoopGood.java")
                 .withCheck(new AvoidGettingSizeCollectionInLoop())
                 .verifyNoIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidRegexPatternNotStaticTest.java

@@ -1,21 +1,21 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 public class AvoidRegexPatternNotStaticTest {
 
     @Test
     public void testHasIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidRegexPatternNotStatic.java")
                 .withCheck(new AvoidRegexPatternNotStatic())
                 .verifyIssues();
     }
 
     @Test
     public void testHasNoIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFiles(
                         "src/test/files/ValidRegexPattern.java",
                         "src/test/files/ValidRegexPattern2.java",

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSQLRequestInLoopCheckTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidSQLRequestInLoopCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidSQLRequestInLoopCheck.java")
                 .withCheck(new AvoidSQLRequestInLoop())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidSetConstantInBatchInsertTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidSetConstantInBatchInsertTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidSetConstantInBatchUpdateCheck.java")
                 .withCheck(new AvoidSetConstantInBatchUpdate())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsageOfStaticCollectionsTests.java

@@ -1,21 +1,21 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 public class AvoidUsageOfStaticCollectionsTests {
 
     @Test
     public void testHasIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidUsageOfStaticCollections.java")
                 .withCheck(new AvoidUsageOfStaticCollections())
                 .verifyIssues();
     }
 
     @Test
     public void testNoIssues() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/GoodUsageOfStaticCollections.java")
                 .withCheck(new AvoidUsageOfStaticCollections())
                 .verifyNoIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/AvoidUsingGlobalVariablesCheckCheckTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class AvoidUsingGlobalVariablesCheckCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/AvoidUsingGlobalVariablesCheck.java")
                 .withCheck(new AvoidUsingGlobalVariablesCheck())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/FreeResourcesOfAutoCloseableInterfaceTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class FreeResourcesOfAutoCloseableInterfaceTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/FreeResourcesOfAutoCloseableInterface.java")
                 .withCheck(new FreeResourcesOfAutoCloseableInterface())
                 .withJavaVersion(7)
@@ -16,7 +16,7 @@ void test() {
 
     @Test
     void test_no_java_version() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/FreeResourcesOfAutoCloseableInterface.java")
                 .withCheck(new FreeResourcesOfAutoCloseableInterface())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/IncrementCheckTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class IncrementCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/IncrementCheck.java")
                 .withCheck(new IncrementCheck())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/InitializeBufferWithAppropriateSizeTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class InitializeBufferWithAppropriateSizeTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/InitializeBufferWithAppropriateSize.java")
                 .withCheck(new InitializeBufferWithAppropriateSize())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/NoFunctionCallWhenDeclaringForLoopTest.java

@@ -1,12 +1,12 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class NoFunctionCallWhenDeclaringForLoopTest {
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/NoFunctionCallWhenDeclaringForLoop.java")
                 .withCheck(new NoFunctionCallWhenDeclaringForLoop())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/OptimizeReadFileExceptionCheckTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class OptimizeReadFileExceptionCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/OptimizeReadFileExceptionCheck.java")
                 .withCheck(new OptimizeReadFileExceptions())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/UnnecessarilyAssignValuesToVariablesTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class UnnecessarilyAssignValuesToVariablesTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/UnnecessarilyAssignValuesToVariablesTestCheck.java")
                 .withCheck(new UnnecessarilyAssignValuesToVariables())
                 .verifyIssues();

java-plugin/src/test/java/fr/cnumr/java/checks/UseCorrectLoopCheckTest.java

@@ -1,13 +1,13 @@
 package fr.cnumr.java.checks;
 
 import org.junit.jupiter.api.Test;
-import org.sonar.java.checks.verifier.JavaCheckVerifier;
+import org.sonar.java.checks.verifier.CheckVerifier;
 
 class UseCorrectLoopCheckTest {
 
     @Test
     void test() {
-        JavaCheckVerifier.newVerifier()
+        CheckVerifier.newVerifier()
                 .onFile("src/test/files/UseCorrectForLoopCheck.java")
                 .withCheck(new UseCorrectForLoop())
                 .verifyIssues();