diff --git a/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewCodeCmd.java b/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewCodeCmd.java
index 69033ecf56..1827c80ad1 100644
--- a/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewCodeCmd.java
+++ b/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewCodeCmd.java
@@ -320,14 +320,9 @@ public class ReviewCodeCmd extends AbstractDefaultCommand {
         if (javaProject.exists()) {
             final String compilerCompliance = javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true);
             log.debug("compilerCompliance = " + compilerCompliance);
-            if (JavaCore.VERSION_1_3.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_13);
-            } else if (JavaCore.VERSION_1_4.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_14);
-            } else if (JavaCore.VERSION_1_5.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_15);
-            } else if (JavaCore.VERSION_1_6.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_16);
+            final SourceType s = SourceType.getSourceTypeForId("java " + compilerCompliance);
+            if (s != null) {
+                pmdEngine.setJavaVersion(s);
             } else {
                 throw new CommandException("The target JDK, " + compilerCompliance + " is not yet supported"); // TODO:
                 // NLS
diff --git a/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewResourceForRuleCommand.java b/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewResourceForRuleCommand.java
index 3eee0618ff..1da3deb55f 100644
--- a/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewResourceForRuleCommand.java
+++ b/pmd-eclipse-plugin/pmd-eclipse-runtime/src/net/sourceforge/pmd/runtime/cmd/ReviewResourceForRuleCommand.java
@@ -137,14 +137,9 @@ public class ReviewResourceForRuleCommand extends AbstractDefaultCommand {
         if (javaProject.exists()) {
             final String compilerCompliance = javaProject.getOption(JavaCore.COMPILER_COMPLIANCE, true);
             log.debug("compilerCompliance = " + compilerCompliance);
-            if (JavaCore.VERSION_1_3.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_13);
-            } else if (JavaCore.VERSION_1_4.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_14);
-            } else if (JavaCore.VERSION_1_5.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_15);
-            } else if (JavaCore.VERSION_1_6.equals(compilerCompliance)) {
-                pmdEngine.setJavaVersion(SourceType.JAVA_16);
+            final SourceType s = SourceType.getSourceTypeForId("java " + compilerCompliance);
+            if (s != null) {
+                pmdEngine.setJavaVersion(s);
             } else {
                 throw new CommandException("The target JDK, " + compilerCompliance + " is not yet supported"); // TODO:
                 // NLS