rife2/bld-pmd
rife2/bld-pmd
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Upgraded to PMD 7.0.0-rc1

Browse source
This commit is contained in:
Erik C. Thauvin 2023-04-21 02:27:18 -07:00
parent d5ab8b6518
commit 93b466a338
10 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/codeStyles/codeStyleConfig.xml generated
View file

@ -1,5 +1,5 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<state> <state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" /> <option name="PREFERRED_PROJECT_CODE_STYLE" value="Erik's Code Style" />
</state> </state>
</component> </component>

4
.idea/libraries/bld.xml generated
View file

@ -2,11 +2,11 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.20.jar!/" /> <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.22.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.20-sources.jar!/" /> <root url="jar://$USER_HOME$/.rife2/dist/rife2-1.5.22-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

2
.vscode/settings.json vendored
View file

@ -7,7 +7,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.rife2/dist/rife2-1.5.20.jar", "${HOME}/.rife2/dist/rife2-1.5.22.jar",
"lib/compile/*.jar", "lib/compile/*.jar",
"lib/runtime/*.jar", "lib/runtime/*.jar",
"lib/test/*.jar" "lib/test/*.jar"

BIN
lib/bld/bld-wrapper.jar
View file

Binary file not shown.

2
lib/bld/bld-wrapper.properties
View file

@ -3,4 +3,4 @@ bld.downloadExtensionSources=true
bld.extensions= bld.extensions=
bld.repositories=MAVEN_CENTRAL,RIFE2 bld.repositories=MAVEN_CENTRAL,RIFE2
rife2.downloadLocation= rife2.downloadLocation=
rife2.version=1.5.20 rife2.version=1.5.22

14
src/bld/java/rife/bld/extension/PmdOperationBuild.java
View file

@ -7,8 +7,11 @@ import rife.bld.publish.PublishScm;
import java.util.List; import java.util.List;
import static rife.bld.dependencies.Repository.*; import static rife.bld.dependencies.Repository.MAVEN_CENTRAL;
import static rife.bld.dependencies.Scope.*; import static rife.bld.dependencies.Repository.RIFE2_RELEASES;
import static rife.bld.dependencies.Scope.compile;
import static rife.bld.dependencies.Scope.runtime;
import static rife.bld.dependencies.Scope.test;
import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING;
@ -23,11 +26,12 @@ public class PmdOperationBuild extends Project {
autoDownloadPurge = true; autoDownloadPurge = true;
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
var pmd = version(7, 0, 0, "rc1");
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 20))) .include(dependency("com.uwyn.rife2", "rife2", version(1, 5, 22)))
.include(dependency("net.sourceforge.pmd:pmd-java:6.55.0")); .include(dependency("net.sourceforge.pmd", "pmd-java", pmd));
scope(runtime) scope(runtime)
.include(dependency("net.sourceforge.pmd:pmd:6.55.0")); .include(dependency("net.sourceforge.pmd", "pmd-java", pmd));
scope(test) scope(test)
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2)))

13
src/main/java/rife/bld/extension/PmdOperation.java
View file

@ -353,7 +353,8 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
var pmd = PmdAnalysis.create(config); var pmd = PmdAnalysis.create(config);
var report = pmd.performAnalysisAndCollectReport(); var report = pmd.performAnalysisAndCollectReport();
if (LOGGER.isLoggable(Level.INFO)) { if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info(String.format("[%s] ruleSets%s", commandName, ruleSets)); LOGGER.log(Level.INFO, "[{0}] inputPaths{1}", new Object[]{commandName, inputPaths});
LOGGER.log(Level.INFO, "[{0}] ruleSets{1}", new Object[]{commandName, ruleSets});
} }
var numErrors = report.getViolations().size(); var numErrors = report.getViolations().size();
if (numErrors > 0) { if (numErrors > 0) {
@ -362,11 +363,11 @@ public class PmdOperation extends AbstractOperation<PmdOperation> {
config.getReportFilePath().toUri()); config.getReportFilePath().toUri());
for (var v : report.getViolations()) { for (var v : report.getViolations()) {
if (LOGGER.isLoggable(Level.WARNING)) { if (LOGGER.isLoggable(Level.WARNING)) {
LOGGER.warning(String.format("[%s] %s:%d:\n\t%s (%s)\n\t\t--> %s", commandName, LOGGER.log(Level.WARNING, "[{0}] {1}:{2}:\n\t{3} ({4})\n\t\t--> {5}",
Paths.get(v.getFilename()).toUri(), v.getBeginLine(), v.getRule().getName(), new Object[]{commandName, Paths.get(v.getFilename()).toUri(), v.getBeginLine(),
v.getRule().getExternalInfoUrl() //TODO bug in PMD? v.getRule().getName(),
.replace("${pmd.website.baseurl}", "https://docs.pmd-code.org/pmd-doc-6.55.0"), v.getRule().getExternalInfoUrl(),
v.getDescription())); v.getDescription()});
} }
} }
if (config.isFailOnViolation()) { if (config.isFailOnViolation()) {

10
src/test/java/rife/bld/extension/PmdOperationTest.java
View file

@ -39,7 +39,7 @@ class PmdOperationTest {
static final String CATEGORY_FOO = "category/foo.xml"; static final String CATEGORY_FOO = "category/foo.xml";
static final String CODE_STYLE = "category/java/codestyle.xml"; static final String CODE_STYLE = "category/java/codestyle.xml";
static final Path CODE_STYLE_SAMPLE = Path.of("src/test/resources/java/CodeStyle.java"); static final Path CODE_STYLE_SAMPLE = Path.of("src/test/resources/java/CodeStyle.java");
static final int CODING_STYLE_ERRORS = 16; static final int CODING_STYLE_ERRORS = 13;
static final String COMMAND_NAME = "pmd"; static final String COMMAND_NAME = "pmd";
static final String ERROR_PRONE = "category/java/errorprone.xml"; static final String ERROR_PRONE = "category/java/errorprone.xml";
static final int ERROR_PRONE_ERRORS = 8; static final int ERROR_PRONE_ERRORS = 8;
@ -59,7 +59,7 @@ class PmdOperationTest {
void testAddInputPaths() { void testAddInputPaths() {
var pmd = newPmdOperation().ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE).inputPaths(ERROR_PRONE_SAMPLE) var pmd = newPmdOperation().ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE).inputPaths(ERROR_PRONE_SAMPLE)
.addInputPath(CODE_STYLE_SAMPLE); .addInputPath(CODE_STYLE_SAMPLE);
assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(42); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(36);
} }
@Test @Test
@ -128,7 +128,7 @@ class PmdOperationTest {
.as("code style").isEqualTo(CODING_STYLE_ERRORS); .as("code style").isEqualTo(CODING_STYLE_ERRORS);
pmd = pmd.addRuleSet(ERROR_PRONE).addInputPath(ERROR_PRONE_SAMPLE); pmd = pmd.addRuleSet(ERROR_PRONE).addInputPath(ERROR_PRONE_SAMPLE);
assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME)))
.as("code style + error prone").isEqualTo(40); .as("code style + error prone").isEqualTo(34);
} }
@Test @Test
@ -156,7 +156,7 @@ class PmdOperationTest {
void testJavaMultiThreading() { void testJavaMultiThreading() {
var pmd = newPmdOperation().ruleSets("category/java/multithreading.xml") var pmd = newPmdOperation().ruleSets("category/java/multithreading.xml")
.inputPaths(Path.of("src/test/resources/java/MultiThreading.java")); .inputPaths(Path.of("src/test/resources/java/MultiThreading.java"));
assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(4); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(3);
} }
@Test @Test
@ -170,7 +170,7 @@ class PmdOperationTest {
void testJavaQuickStart() { void testJavaQuickStart() {
var pmd = newPmdOperation().ruleSets("rulesets/java/quickstart.xml") var pmd = newPmdOperation().ruleSets("rulesets/java/quickstart.xml")
.inputPaths(Path.of("src/test/resources/java")); .inputPaths(Path.of("src/test/resources/java"));
assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(35); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(34);
} }
@Test @Test

3
src/test/resources/ignore-all.txt
View file

@ -1 +1,2 @@
src/test/resources/java/ src/main
src/test

2
src/test/resources/java/Security.java
View file

@ -16,6 +16,8 @@
package java; package java;
import javax.crypto.spec.SecretKeySpec;
/** /**
* Security class * Security class
* *