Upgrade to latest PMD

pom.xml

@@ -60,6 +60,7 @@
   <properties>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
 
+    <pmd.version>6.7.0</pmd.version>
     <pmd.version>5.4.2</pmd.version>
     <junit.jupiter.version>5.3.1</junit.jupiter.version>
   </properties>

src/main/java/org/sonar/plugins/pmd/PmdTemplate.java

@@ -39,7 +39,6 @@
 public class PmdTemplate {
 
     private static final Logger LOG = Loggers.get(PmdTemplate.class);
-
     private static final Map<String, String> JAVA_VERSIONS = prepareVersions();
 
     private static Map<String, String> prepareVersions() {
@@ -50,7 +49,10 @@ private static Map<String, String> prepareVersions() {
         versions.put("6", "1.6");
         versions.put("7", "1.7");
         versions.put("8", "1.8");
-
+        versions.put("9", "9");
+        versions.put("10", "10");
+        versions.put("11", "11");
+
         return versions;
     }
 

src/test/java/org/sonar/plugins/pmd/PmdConfigurationTest.java

@@ -96,13 +96,12 @@ void should_fail_to_dump_xml_rule_set() {
     @Test
     void should_dump_xml_report() throws IOException {
         when(fs.workDir()).thenReturn(WORK_DIR);
-
         settings.setProperty(PmdConfiguration.PROPERTY_GENERATE_XML, true);
         Path reportFile = configuration.dumpXmlReport(new Report());
 
         assertThat(reportFile.toFile()).isEqualTo(new File(WORK_DIR, "pmd-result.xml"));
         List<String> writtenLines = Files.readAllLines(reportFile, StandardCharsets.UTF_8);
-        assertThat(writtenLines).hasSize(3);
+        assertThat(writtenLines).hasSize(6);
         assertThat(writtenLines.get(1)).contains("<pmd");
     }
 

src/test/java/org/sonar/plugins/pmd/PmdTemplateTest.java

@@ -31,11 +31,8 @@
 import net.sourceforge.pmd.RuleContext;
 import net.sourceforge.pmd.RuleSets;
 import net.sourceforge.pmd.SourceCodeProcessor;
-import net.sourceforge.pmd.lang.java.Java13Handler;
-import net.sourceforge.pmd.lang.java.Java15Handler;
-import net.sourceforge.pmd.lang.java.Java16Handler;
-import net.sourceforge.pmd.lang.java.Java17Handler;
-import net.sourceforge.pmd.lang.java.Java18Handler;
+import net.sourceforge.pmd.lang.java.JavaLanguageHandler;
+import org.junit.Test;
 import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
 import org.sonar.api.batch.fs.InputFile;
@@ -88,29 +85,44 @@ void should_ignore_PMD_error() throws PMDException {
     }
 
     @Test
-    void java12_version() {
-        assertThat(PmdTemplate.languageVersion("1.2").getLanguageVersionHandler()).isInstanceOf(Java13Handler.class);
-    }
-
-    @Test
-    void java5_version() {
-        assertThat(PmdTemplate.languageVersion("5").getLanguageVersionHandler()).isInstanceOf(Java15Handler.class);
-    }
-
-    @Test
-    void java6_version() {
-        assertThat(PmdTemplate.languageVersion("6").getLanguageVersionHandler()).isInstanceOf(Java16Handler.class);
-    }
-
-    @Test
-    void java7_version() {
-        assertThat(PmdTemplate.languageVersion("7").getLanguageVersionHandler()).isInstanceOf(Java17Handler.class);
-    }
-
-    @Test
-    void java8_version() {
-        assertThat(PmdTemplate.languageVersion("8").getLanguageVersionHandler()).isInstanceOf(Java18Handler.class);
-    }
+  public void java12_version() {
+    assertThat(PmdTemplate.languageVersion("1.2").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
+
+  @Test
+  public void java5_version() {
+    assertThat(PmdTemplate.languageVersion("5").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
+
+  @Test
+  public void java6_version() {
+    assertThat(PmdTemplate.languageVersion("6").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
+
+  @Test
+  public void java7_version() {
+    assertThat(PmdTemplate.languageVersion("7").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
+
+  @Test
+  public void java8_version() {
+    assertThat(PmdTemplate.languageVersion("8").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
+
+  @Test
+  public void java9_version() {
+    assertThat(PmdTemplate.languageVersion("9").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
+
+  @Test
+  public void java10_version() {
+    assertThat(PmdTemplate.languageVersion("10").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
+
+  @Test
+  public void java11_version() {
+    assertThat(PmdTemplate.languageVersion("11").getLanguageVersionHandler()).isInstanceOf(JavaLanguageHandler.class);
+  }
 
     @Test
     void should_fail_on_invalid_java_version() {
@@ -138,5 +150,4 @@ void should_set_encoding() {
         PmdTemplate pmdTemplate = PmdTemplate.create("6", mock(ClassLoader.class), StandardCharsets.UTF_16BE);
         assertThat(pmdTemplate.configuration().getSourceEncoding()).isEqualTo("UTF-16BE");
     }
-
 }

src/test/resources/org/sonar/plugins/pmd/simple.xml

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset>
-  <description>Sonar PMD rules</description>
-  <rule ref="rulesets/java/coupling.xml/CouplingBetweenObjects">
-    <priority>2</priority>
-    <properties>
-      <property name="threshold" value="20"/>
-    </properties>
-  </rule>
-  <rule ref="rulesets/java/coupling.xml/ExcessiveImports">
-    <properties>
-      <property name="minimum" value="30"/>
-    </properties>
-  </rule>
-  <rule ref="rulesets/java/design.xml/UseNotifyAllInsteadOfNotify">
-    <priority>4</priority>
-  </rule>
-  <rule class="net.sourceforge.pmd.lang.java.rule.design.UseCollectionIsEmptyRule">
-    <priority>3</priority>
-  </rule>
+    <description>Sonar PMD rules</description>
+    <rule name="Sample1" ref="rulesets/java/coupling.xml/CouplingBetweenObjects">
+        <priority>2</priority>
+        <properties>
+            <property name="threshold" value="20"/>
+        </properties>
+    </rule>
+    <rule name="Sample2" ref="rulesets/java/coupling.xml/ExcessiveImports">
+        <properties>
+            <property name="minimum" value="30"/>
+        </properties>
+    </rule>
+    <rule name="Sample3" ref="rulesets/java/design.xml/UseNotifyAllInsteadOfNotify">
+        <priority>4</priority>
+    </rule>
+    <rule name="Sample4" class="net.sourceforge.pmd.lang.java.rule.design.UseUtilityClassRule">
 </ruleset>