From 3a431dd535541228843b51dea1e1133ce497db49 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@knecon.com>
Date: Mon, 29 Jan 2024 10:32:29 +0100
Subject: [PATCH] RED-8085  pmd checkup/cleanup

---
 .../com.iqser.red.service.java-conventions.gradle.kts     | 6 +++++-
 config/pmd/pmd.xml                                        | 8 ++++----
 config/pmd/test_pmd.xml                                   | 8 +++-----
 .../redaction-report-service-server-v1/build.gradle.kts   | 2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
index 7f4af15..02b73fc 100644
--- a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
@@ -23,6 +23,10 @@ group = "com.iqser.red.service"
 java.sourceCompatibility = JavaVersion.VERSION_17
 java.targetCompatibility = JavaVersion.VERSION_17
 
+pmd {
+    isConsoleOutput = true
+}
+
 tasks.pmdMain {
     pmd.ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
 }
@@ -53,4 +57,4 @@ tasks.jacocoTestReport {
 
 java {
     withJavadocJar()
-}
\ No newline at end of file
+}
diff --git a/config/pmd/pmd.xml b/config/pmd/pmd.xml
index 22d6d4c..c81f4ee 100644
--- a/config/pmd/pmd.xml
+++ b/config/pmd/pmd.xml
@@ -9,13 +9,13 @@
     </description>
 
     <rule ref="category/java/errorprone.xml">
-        <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="MissingSerialVersionUID"/>
-        <exclude name="NullAssignment"/>
         <exclude name="AvoidLiteralsInIfCondition"/>
         <exclude name="AvoidDuplicateLiterals"/>
-        <exclude name="AvoidFieldNameMatchingMethodName"/>
+        <exclude name="NullAssignment"/>
         <exclude name="AssignmentInOperand"/>
+        <exclude name="BeanMembersShouldSerialize"/>
+
     </rule>
 
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/config/pmd/test_pmd.xml b/config/pmd/test_pmd.xml
index 56d37d9..be4aa92 100644
--- a/config/pmd/test_pmd.xml
+++ b/config/pmd/test_pmd.xml
@@ -10,15 +10,13 @@
 
 
     <rule ref="category/java/errorprone.xml">
-        <exclude name="DataflowAnomalyAnalysis"/>
         <exclude name="MissingSerialVersionUID"/>
-        <exclude name="NullAssignment"/>
         <exclude name="AvoidLiteralsInIfCondition"/>
         <exclude name="AvoidDuplicateLiterals"/>
-        <exclude name="AvoidFieldNameMatchingMethodName"/>
-        <exclude name="AvoidFieldNameMatchingTypeName"/>
+        <exclude name="NullAssignment"/>
         <exclude name="AssignmentInOperand"/>
         <exclude name="TestClassWithoutTestCases"/>
+        <exclude name="BeanMembersShouldSerialize"/>
     </rule>
 
-</ruleset>
\ No newline at end of file
+</ruleset>
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts
index 925643b..ba093ff 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.springframework.boot") version "3.1.5"
     id("io.spring.dependency-management") version "1.1.0"
     id("org.sonarqube") version "4.2.1.3168"
-    id("io.freefair.lombok") version "8.1.0"
+    id("io.freefair.lombok") version "8.4"
 }
 
 description = "redaction-service-server-v1"