Merge pull request #499 from jborgers/master-fix-supported-java-versions

fix supported java versions up to 24-preview

Author: jborgers

integration-test/src/test/java/com/sonar/it/java/suite/PmdIT.java

@@ -48,7 +48,7 @@ static void startSonar() {
     }
 
     @ParameterizedTest
-    @EnumSource(value = JavaVersion.class, mode = EnumSource.Mode.INCLUDE, names = {"JAVA_1_8", "JAVA_11", "JAVA_17", "JAVA_20"})
+    @EnumSource(value = JavaVersion.class, mode = EnumSource.Mode.INCLUDE, names = {"JAVA_1_8", "JAVA_11", "JAVA_17", "JAVA_21", "JAVA_22"})
     void testPmdExtensionsWithDifferentJavaVersions(JavaVersion version) {
 
         // given

pom.xml

@@ -83,7 +83,7 @@
 
   <properties>
     <!-- use -Drevision=x.y.z to override in build -->
-    <revision>4.0.0-SNAPSHOT</revision>
+    <revision>4.0.1-SNAPSHOT</revision>
     <license.owner>SonarSource SA and others</license.owner>
     <license.mailto>mailto:jborgers AT jpinpoint DOT com; peter.paul.bakker AT stokpop DOT nl</license.mailto>
     <pmd.version>7.10.0</pmd.version>

sonar-pmd-plugin/src/main/java/org/sonar/plugins/pmd/PmdConstants.java

@@ -43,17 +43,17 @@ public final class PmdConstants {
     /**
      * Default value for property {@link #JAVA_SOURCE_VERSION}.
      */
-    public static final String JAVA_SOURCE_VERSION_DEFAULT_VALUE = "11";
+    public static final String JAVA_SOURCE_VERSION_DEFAULT_VALUE = "24";
 
     /**
-     * Maximum supported value for property {@link #JAVA_SOURCE_VERSION}. For PMD 6 this is 20-preview.
+     * Maximum supported value for property {@link #JAVA_SOURCE_VERSION}. For PMD 7 this is 24-preview.
      */
-    public static final String JAVA_SOURCE_MAXIMUM_SUPPORTED_VALUE = "20-preview";
+    public static final String JAVA_SOURCE_MAXIMUM_SUPPORTED_VALUE = "24-preview";
 
     /**
-     * Minimum UNsupported value for property {@link #JAVA_SOURCE_VERSION}. For PMD 6 this is 21.
+     * Minimum UNsupported value for property {@link #JAVA_SOURCE_VERSION}. For PMD 7 this is 25.
      */
-    public static final String JAVA_SOURCE_MINIMUM_UNSUPPORTED_VALUE = "21";
+    public static final String JAVA_SOURCE_MINIMUM_UNSUPPORTED_VALUE = "25";
     /**
      * The Java Language key.
      */

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

@@ -54,9 +54,12 @@ private static Map<String, String> prepareVersions() {
         versions.put("1.17", "17");
         versions.put("1.18", "18");
         versions.put("1.19", "19");
-        versions.put("1.19-preview", "19-preview");
         versions.put("1.20", "20");
-        versions.put("1.20-preview", "20-preview");
+        versions.put("1.21", "21");
+        versions.put("1.22", "22");
+        versions.put("1.23", "23");
+        versions.put("1.24", "24");
+        versions.put("1.24-preview", "24-preview");
         return versions;
     }
 

sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdConstantsTest.java

@@ -38,7 +38,7 @@ void checkDefinedKeys() {
         assertThat(PmdConstants.XPATH_EXPRESSION_PARAM).isEqualTo("xpath");
         assertThat(PmdConstants.XPATH_MESSAGE_PARAM).isEqualTo("message");
         assertThat(PmdConstants.JAVA_SOURCE_VERSION).isEqualTo("sonar.java.source");
-        assertThat(PmdConstants.JAVA_SOURCE_VERSION_DEFAULT_VALUE).isEqualTo("11");
+        assertThat(PmdConstants.JAVA_SOURCE_VERSION_DEFAULT_VALUE).isEqualTo("24");
         assertThat(PmdConstants.LANGUAGE_JAVA_KEY).isEqualTo("java");
     }
 }