From 9954e9405fc2fbf850a195654d02a6a8af823509 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 26 Apr 2024 01:36:24 -0700 Subject: [PATCH 01/61] Bumped PMD to version 7.1.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 1bb6f66..371960f 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -34,20 +34,20 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(0, 9, 8); + version = version(0, 9, 9); javaRelease = 17; downloadSources = true; autoDownloadPurge = true; repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - var pmd = version(7, 0, 0); + var pmd = version(7, 1, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 0))) .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, 13))); 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))) @@ -78,7 +78,7 @@ public class PmdOperationBuild extends Project { .license( new PublishLicense() .name("The Apache License, Version 2.0") - .url("http://www.apache.org/licenses/LICENSE-2.0.txt") + .url("https://www.apache.org/licenses/LICENSE-2.0.txt") ) .scm( new PublishScm() From f7901987b39569734de1fd639a8e11bb54322127 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 26 Apr 2024 02:03:12 -0700 Subject: [PATCH 02/61] Cleaned up the PMD documenaation URLs --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8b71b6d..abff8aa 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions). -To check all source code using the [Java Quickstart](https://pmd.github.io/pmd/pmd_rules_java.html) configuration, add the following to your build file: +To check all source code using the [Java Quickstart](https://docs.pmd-code.org/latest/pmd_rules_java.html) configuration, add the following to your build file: ```java @BuildCommand(summary = "Checks source code with PMD") @@ -25,7 +25,7 @@ public void pmd() throws Exception { ./bld pmd test ``` -To check the main source directory using a custom ruleset, [Java Error Prone](https://pmd.github.io/pmd/pmd_rules_java.html#error-prone) configuration, and failing on any violation. +To check the main source directory using a custom ruleset, [Java Error Prone](https://docs.pmd-code.org/latest/pmd_rules_java.html#error-prone) configuration, and failing on any violation. ```java @BuildCommand(value = "pmd-main", summary = "Checks main source code with PMD") @@ -33,7 +33,7 @@ public void pmdMain() throws Exception { new PmdOperation() .fromProject(this) .failOnViolation(true) - .inputPaths(this.srcMainDirectory().toPath()) + .inputPaths(srcMainDirectory().toPath()) .ruleSets("config/pmd.xml", "category/java/errorprone.xml") .execute(); } From bcaab9bf9d97775117f24ecc60acaf42fded79e2 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 9 May 2024 21:21:40 -0700 Subject: [PATCH 03/61] Bumped bld to version 1.9.1 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 27319 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/PmdOperationBuild.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 0b615c1..a2969be 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 9e8368e..d136e4d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.0.jar", + "${HOME}/.bld/dist/bld-1.9.1.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index abff8aa..0a6cbb7 100755 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-pmd/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pmd) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pmd/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pmd) [![GitHub CI](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index e8151771783f2379f035bbdc7afea15ebd09faaa..b1d78435628aa33a032d21dd5164b72a595f9e52 100644 GIT binary patch delta 166 zcmdmfm2vx3M&1B#W)=|!4h{~6gr3C{dFz;g)W$v~V-UT0vvD^QnBi!~t_Nm#r<`X5 zGi1{Y!BUe0GZYnB7y`W6IrKB%X0tOeFt7q~fHxzP2m{>U$&)jjLE0wY%VOdrXNgNSGOa{$#vfXtd)lVuG6PK7su delta 166 zcmdmfm2vx3M&1B#W)=|!4h{~6NhP@xdFz;g)W$v~V-UT0vvD^QnBi!~t_Nm#r<`X5 zGi1{Y!BUe0GZYmW7y`W6Id(?Al3{0HU|DV?# diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 4655e2b..b62b947 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -3,4 +3,4 @@ bld.downloadExtensionSources=true bld.extensions=com.uwyn.rife2:bld-jacoco-report:0.9.5 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= -bld.version=1.9.0 +bld.version=1.9.1 diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 371960f..e0ceeb7 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, 9); + version = version(1, 0, 0, "SNAPSHOT"); javaRelease = 17; downloadSources = true; @@ -43,7 +43,7 @@ public class PmdOperationBuild extends Project { var pmd = version(7, 1, 0); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 0))) + .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)) From b6df5df8949b3d35576ba8b303aed60c5438bec4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 31 May 2024 12:16:01 -0700 Subject: [PATCH 04/61] Bumped PMD to version 7.2.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index e0ceeb7..66fc125 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -34,14 +34,15 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 0, 0, "SNAPSHOT"); + version = version(1, 0, 0); javaRelease = 17; + downloadSources = true; autoDownloadPurge = true; repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - var pmd = version(7, 1, 0); + var pmd = version(7, 2, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); @@ -51,7 +52,7 @@ public class PmdOperationBuild extends Project { 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.assertj", "assertj-core", version(3, 26, 0))); javadocOperation() .javadocOptions() From 884fe381ddb92c0c616500765f555d65068a3f7f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 7 Jun 2024 15:57:10 -0700 Subject: [PATCH 05/61] Fixed output message format when includelineNumber is false --- src/main/java/rife/bld/extension/PmdOperation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index 0d1dae1..5a57508 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -430,7 +430,7 @@ public class PmdOperation extends AbstractOperation { 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}\""; + msg = "[{0}] {1} (line: {2})\n\t{3} ({4})\n\t\t--> {5}"; } LOGGER.log(Level.WARNING, msg, new Object[]{commandName, From 9f64b6d7d8787c3da0c5295cd8494982e98e941a Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 7 Jun 2024 15:59:16 -0700 Subject: [PATCH 06/61] Version 1.0.1 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 66fc125..dddfedc 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(1, 0, 0); + version = version(1, 0, 1); javaRelease = 17; From 0e55b2774ac4416eb8fe5b248ac5511604802b3e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 22 Jun 2024 11:06:50 -0700 Subject: [PATCH 07/61] Removed JaCoCo extension --- lib/bld/bld-wrapper.jar | Bin 27319 -> 27319 bytes lib/bld/bld-wrapper.properties | 3 +-- .../rife/bld/extension/PmdOperationBuild.java | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index b1d78435628aa33a032d21dd5164b72a595f9e52..0ba02e996b4a4240705648c56e024628304a4da1 100644 GIT binary patch delta 131 zcmdmfm2vx3M&1B#W)=|!4h{~6;Jy Date: Sat, 22 Jun 2024 11:10:46 -0700 Subject: [PATCH 08/61] Replaced List with Collection whenever applicable. Added rule priority configuration. Cleaned up tests --- .idea/runConfigurations/PmdOperation.xml | 9 - .idea/runConfigurations/Run Tests.xml | 13 - README.md | 3 +- config/pmd.xml | 109 +++++ .../rife/bld/extension/PmdOperationBuild.java | 2 +- .../java/rife/bld/extension/PmdOperation.java | 454 ++++++++++++++---- .../rife/bld/extension/PmdOperationTest.java | 262 +++++++--- src/test/resources/ignore-single.txt | 1 + 8 files changed, 679 insertions(+), 174 deletions(-) delete mode 100644 .idea/runConfigurations/PmdOperation.xml delete mode 100644 .idea/runConfigurations/Run Tests.xml create mode 100644 config/pmd.xml create mode 100644 src/test/resources/ignore-single.txt diff --git a/.idea/runConfigurations/PmdOperation.xml b/.idea/runConfigurations/PmdOperation.xml deleted file mode 100644 index 4c7df76..0000000 --- a/.idea/runConfigurations/PmdOperation.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml deleted file mode 100644 index 65b2217..0000000 --- a/.idea/runConfigurations/Run Tests.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -