Merge branch 'master' into log-exceptions

Author: jsotuyod

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

CHANGELOG.md

@@ -2,9 +2,13 @@
 
 ## Next
 
+* **Bump required pmd-core version to 7.0.0-rc3.**
+
 **Fixed issues:**
 
+* [#61](https://github.com/pmd/pmd-designer/issues/61) Remove dependency to jcommander
 * [#62](https://github.com/pmd/pmd-designer/issues/62) Exceptions and errors are not always logged
+* [#63](https://github.com/pmd/pmd-designer/issues/63) Update to PMD 7.0.0-rc3
 
 **Merged pull requests:**
 

pom.xml

@@ -54,7 +54,7 @@
     </developers>
 
     <properties>
-        <pmd.core.version>7.0.0-rc1</pmd.core.version>
+        <pmd.core.version>7.0.0-rc3</pmd.core.version>
         <openjfx.version>11.0.2</openjfx.version>
         <java.version>8</java.version>
         <kotlin.version>1.7.20</kotlin.version>
@@ -67,7 +67,7 @@
 
         <local.lib.repo>${project.basedir}/lib/mvn-repo</local.lib.repo>
 
-        <surefire.version>3.0.0-M8</surefire.version>
+        <surefire.version>3.1.0</surefire.version>
         <checkstyle.version>10.7.0</checkstyle.version>
         <checkstyle.plugin.version>3.2.1</checkstyle.plugin.version>
         <javadoc.plugin.version>3.4.1</javadoc.plugin.version>
@@ -77,9 +77,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <pmd.build-tools.version>20</pmd.build-tools.version>
-        <pmd.plugin.version>3.20.0</pmd.plugin.version>
-        <pmd.check.version>6.54.0</pmd.check.version>
+        <pmd.build-tools.version>21</pmd.build-tools.version>
+        <pmd.plugin.version>3.21.0</pmd.plugin.version>
+        <pmd.check.version>6.55.0</pmd.check.version>
 
         <jflex-output>${project.build.directory}/generated-sources/jflex</jflex-output>
 

src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerStarter.java

@@ -13,8 +13,6 @@
 
 import net.sourceforge.pmd.annotation.InternalApi;
 
-import com.beust.jcommander.JCommander;
-import com.beust.jcommander.ParameterException;
 import javafx.application.Application;
 
 /**
@@ -46,43 +44,12 @@ private static boolean isJavaFxAvailable() {
         }
     }
 
-    @Deprecated
-    private static MainCliArgs readParameters(String[] argv) {
-
-        MainCliArgs argsObj = new MainCliArgs();
-        JCommander jCommander = new JCommander(argsObj);
-        jCommander.setProgramName("designer");
-
-        try {
-            jCommander.parse(argv);
-
-            if (argsObj.help) {
-                System.out.println(getHelpText(jCommander));
-                System.exit(ExitStatus.OK.getCode());
-            }
-
-            return argsObj;
-
-        } catch (ParameterException e) {
-            System.out.println(e.getMessage());
-            System.out.println();
-            System.out.println(getHelpText(jCommander));
-            System.exit(ExitStatus.OK.getCode());
-            throw new AssertionError();
-        }
-
-
-    }
-
     /**
      * Starting from PMD 7.0.0 this method usage will be limited for development.
      * CLI support will be provided by pmd-cli
      */
     @InternalApi
     public static void main(String[] args) {
-
-        readParameters(args);
-
         final ExitStatus ret = launchGui(args);
         System.exit(ret.getCode());
     }
@@ -122,27 +89,6 @@ private static String getJavaFxVersion() {
         return null;
     }
 
-    @Deprecated
-    private static String getHelpText(JCommander jCommander) {
-
-        StringBuilder sb = new StringBuilder();
-
-
-        jCommander.usage(sb, " ");
-        sb.append("\n");
-        sb.append("\n");
-        sb.append("PMD Rule Designer\n");
-        sb.append("-----------------\n");
-        sb.append("\n");
-        sb.append("The Rule Designer is a graphical tool that helps PMD users develop their custom rules.\n");
-        sb.append("\n");
-        sb.append("\n");
-        sb.append("Source & README: https://github.com/pmd/pmd-designer\n");
-        sb.append("Usage documentation: https://pmd.github.io/latest/pmd_userdocs_extending_designer_reference.html");
-
-        return sb.toString();
-    }
-
     @SuppressWarnings("PMD.AvoidCatchingThrowable")
     public static ExitStatus launchGui(String[] args) {
         setSystemProperties();

src/main/java/net/sourceforge/pmd/util/fxdesigner/MainCliArgs.java

@@ -33,6 +33,7 @@
 import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
 import net.sourceforge.pmd.lang.ast.RootNode;
 import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
+import net.sourceforge.pmd.lang.document.FileId;
 import net.sourceforge.pmd.lang.document.TextDocument;
 import net.sourceforge.pmd.util.fxdesigner.SourceEditorController;
 import net.sourceforge.pmd.util.fxdesigner.app.ApplicationComponent;
@@ -279,7 +280,7 @@ private static Optional<Node> refreshAST(ApplicationComponent component,
                                              LanguageProcessorRegistry lpRegistry) throws ParseAbortedException {
 
         String dummyFilePath = "dummy." + version.getLanguage().getExtensions().get(0);
-        TextDocument textDocument = TextDocument.readOnlyString(source, dummyFilePath, version);
+        TextDocument textDocument = TextDocument.readOnlyString(source, FileId.fromPathLikeString(dummyFilePath), version);
 
         ParserTask task = new ParserTask(
             textDocument,