diff --git a/.vscode/launch.json b/.vscode/launch.json index f4d8eb7..90264e1 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,11 +1,23 @@ { "version": "0.2.0", "configurations": [ + { + "type": "java", + "name": "Run Main", + "request": "launch", + "mainClass": "rife.bld.extension.PmdOperation }, { "type": "java", "name": "Run Tests", "request": "launch", - "mainClass": "rife.bld.extension.PmdOperationTest" + "mainClass": "org.junit.platform.console.ConsoleLauncher", + "args": [ + "--details=verbose", + "--scan-classpath", + "--disable-banner", + "--disable-ansi-colors", + "--exclude-engine=junit-platform-suite", + "--exclude-engine=junit-vintage"] } ] -} \ No newline at end of file +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 1b057c3..5dd7145 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,10 +7,8 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.8.0.jar", - "lib/bld/*.jar", + "${HOME}bld-1.7.0-SNAPSHOT.jar", "lib/compile/*.jar", - "lib/provided/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" ] diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index ae7f26d..cc3d9e7 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index b3b9438..932a2ae 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -34,7 +34,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(0, 9, 6); + version = version(0, 9, 5); javaRelease = 17; downloadSources = true; @@ -47,11 +47,11 @@ public class PmdOperationBuild extends Project { .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)) - .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 12))); + .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 11))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))) - .include(dependency("org.assertj", "assertj-core", version(3, 25, 3))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 1))) + .include(dependency("org.assertj", "assertj-core", version(3, 25, 2))); javadocOperation() .javadocOptions() diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index f55c13e..a7aaf05 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -81,10 +81,6 @@ public class PmdOperation extends AbstractOperation { * The path of the ignore file */ Path ignoreFile_; - /** - * The include line number toggle. - */ - boolean includeLineNumber_ = true; /** * The incremental analysis toggle. */ @@ -304,18 +300,6 @@ public class PmdOperation extends AbstractOperation { return this; } - /** - * Enables or disables including the line number for the beginning of the violation in the analyzed source file URI. - *

- * While clicking on the URI works in IntelliJ IDEA, Visual Studio Code, etc.; it might not in terminal emulators. - *

- * Default: {@code TRUE} - */ - public PmdOperation includeLineNumber(boolean includeLineNumber) { - includeLineNumber_ = includeLineNumber; - return this; - } - /** * Enables or disables incremental analysis. */ @@ -415,17 +399,14 @@ public class PmdOperation extends AbstractOperation { } var numErrors = report.getViolations().size(); if (numErrors > 0) { + var msg = String.format( + "[%s] %d rule violations were found. See the report at: %s", commandName, numErrors, + config.getReportFilePath().toUri()); for (var v : report.getViolations()) { if (LOGGER.isLoggable(Level.WARNING)) { - final String msg; - if (includeLineNumber_) { - msg = "[{0}] {1}:{2}\n\t{3} ({4})\n\t\t--> {5}"; - } else { - msg = "\"[{0}] {1} (line: {2})\\n\\t{3} ({4})\\n\\t\\t--> {5}\""; - } - LOGGER.log(Level.WARNING, msg, + LOGGER.log(Level.WARNING, "[{0}] {1}:{2}:\n\t{3} ({4})\n\t\t--> {5}", new Object[]{commandName, - v.getFileId().getUriString(), + v.getFileId().getAbsolutePath(), v.getBeginLine(), v.getRule().getName(), v.getRule().getExternalInfoUrl() //TODO bug in PMD? @@ -434,15 +415,11 @@ public class PmdOperation extends AbstractOperation { v.getDescription()}); } } - - var violations = String.format( - "[%s] %d rule violations were found. See the report at: %s", commandName, numErrors, - config.getReportFilePath().toUri()); if (config.isFailOnViolation()) { - throw new RuntimeException(violations); // NOPMD + throw new RuntimeException(msg); // NOPMD } else { if (LOGGER.isLoggable(Level.WARNING)) { - LOGGER.warning(violations); + LOGGER.warning(msg); } } } else {