From 185ef4a2fbda33daa35b0df3ee5a32f9ef1e2c73 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 11 Oct 2023 22:58:44 -0400 Subject: [PATCH 1/7] [pom] Bump spotbugs to 4.8.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2f7f57e4..d39d7c78 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.7.3.7-SNAPSHOT + 4.8.0.0-SNAPSHOT maven-plugin spotbugs-maven-plugin @@ -167,11 +167,11 @@ 1695603053 - 4.7.3 + 4.8.0 5.9.3 - 4.7.3 - 4.7.3 + 4.8.0 + 4.8.0 2.0.9 1.10.14 From 9ea17a9fbd03c73f9b84688ddaf08cf3560a0339 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 11 Oct 2023 22:58:55 -0400 Subject: [PATCH 2/7] [pom] Remove extra enforcer rules as parent updated now --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index d39d7c78..016c2bca 100644 --- a/pom.xml +++ b/pom.xml @@ -246,9 +246,6 @@ com.github.spotbugs.maven - - - 1.7.0 From 2d194a1f703f18b6d5d156afbc3cfec73c53788a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 11 Oct 2023 23:00:28 -0400 Subject: [PATCH 3/7] [pom] Bump junit to 5.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 016c2bca..e3440d19 100644 --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ 4.8.0 - 5.9.3 + 5.10.0 4.8.0 4.8.0 2.0.9 From a2f44a8fa3300c415d5ff82e5c10812906ec043b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 11 Oct 2023 23:05:16 -0400 Subject: [PATCH 4/7] [pom] Bump plexus utils to 4.0.0 and add plexus xml at 3.0.0 --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3440d19..2b7a7b70 100644 --- a/pom.xml +++ b/pom.xml @@ -191,7 +191,8 @@ 2.1.1 1.2.0 - 3.5.1 + 4.0.0 + 3.0.0 3.1.0 1.0.0 @@ -599,6 +600,11 @@ plexus-utils ${plexusUtilsVersion} + + org.codehaus.plexus + plexus-xml + ${plexusXmlVersion} + From 1bade8de4f8ee94fe0c1b175e8ac57b0b93ea8c4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Wed, 11 Oct 2023 23:05:23 -0400 Subject: [PATCH 5/7] [pom] Bump surefire to 3.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b7a7b70..21fe3fab 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ 3.11.0 1.12.0 3.3.0 - 3.0.0 + 3.1.2 8.0.0 4.0.4 7.6.0 From 72e2b591578a78cce7cd037c43428f12a84c4fd8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 15 Oct 2023 13:25:08 -0400 Subject: [PATCH 6/7] [pom] Fix IT test names in all poms to match the folders --- src/it/MFINDBUGS-178/pom.xml | 4 ++-- src/it/change-xml-filename/pom.xml | 4 ++-- src/it/check-fail/pom.xml | 4 ++-- src/it/check-failThreshold/pom.xml | 4 ++-- src/it/check-multi-filter-dups/module1/pom.xml | 2 +- src/it/check-multi-filter-dups/module2/pom.xml | 2 +- src/it/check-multi-filter-dups/pom.xml | 4 ++-- src/it/check-multi/modules/pom.xml | 2 +- src/it/check-multi/pom.xml | 4 ++-- src/it/check-nofail/pom.xml | 4 ++-- src/it/encoding-utf8/pom.xml | 2 +- src/it/exclude-multi-list/pom.xml | 4 ++-- src/it/exclude-multi/pom.xml | 4 ++-- src/it/exclude/pom.xml | 4 ++-- src/it/excludeBugsFile/pom.xml | 2 +- src/it/html-report/pom.xml | 4 ++-- src/it/include-multi-list/pom.xml | 4 ++-- src/it/include-multi/pom.xml | 4 ++-- src/it/include/pom.xml | 4 ++-- src/it/verify-clean/pom.xml | 4 ++-- src/it/verify-fail/pom.xml | 4 ++-- src/it/verify/pom.xml | 4 ++-- 22 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/it/MFINDBUGS-178/pom.xml b/src/it/MFINDBUGS-178/pom.xml index acb070f9..77f96a69 100644 --- a/src/it/MFINDBUGS-178/pom.xml +++ b/src/it/MFINDBUGS-178/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + MFINDBUGS-178 + MFINDBUGS-178 jar diff --git a/src/it/change-xml-filename/pom.xml b/src/it/change-xml-filename/pom.xml index 1d4bfc45..6e4bafab 100644 --- a/src/it/change-xml-filename/pom.xml +++ b/src/it/change-xml-filename/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - change-filename - change-filename + change-xml-filename + change-xml-filename jar true diff --git a/src/it/check-fail/pom.xml b/src/it/check-fail/pom.xml index 83b58440..8b901244 100644 --- a/src/it/check-fail/pom.xml +++ b/src/it/check-fail/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + check-fail + check-fail jar diff --git a/src/it/check-failThreshold/pom.xml b/src/it/check-failThreshold/pom.xml index 1c67ca31..122078a3 100644 --- a/src/it/check-failThreshold/pom.xml +++ b/src/it/check-failThreshold/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + check-failThreshold + check-failThreshold jar diff --git a/src/it/check-multi-filter-dups/module1/pom.xml b/src/it/check-multi-filter-dups/module1/pom.xml index 40f213d7..d565392c 100644 --- a/src/it/check-multi-filter-dups/module1/pom.xml +++ b/src/it/check-multi-filter-dups/module1/pom.xml @@ -22,7 +22,7 @@ 4.0.0 spotbugs-maven-plugin.it - check-multi-parent-relative-path + check-multi-filter-dups testing .. diff --git a/src/it/check-multi-filter-dups/module2/pom.xml b/src/it/check-multi-filter-dups/module2/pom.xml index f26b2fd0..4f5fc6f5 100644 --- a/src/it/check-multi-filter-dups/module2/pom.xml +++ b/src/it/check-multi-filter-dups/module2/pom.xml @@ -22,7 +22,7 @@ 4.0.0 spotbugs-maven-plugin.it - check-multi-parent-relative-path + check-multi-filter-dups testing .. diff --git a/src/it/check-multi-filter-dups/pom.xml b/src/it/check-multi-filter-dups/pom.xml index d2dc540f..c0388684 100644 --- a/src/it/check-multi-filter-dups/pom.xml +++ b/src/it/check-multi-filter-dups/pom.xml @@ -25,8 +25,8 @@ testing ../common.xml - check-multi-parent-relative-path - check-multi-parent-relative-path + check-multi-filter-dups + check-multi-filter-dups pom module1 diff --git a/src/it/check-multi/modules/pom.xml b/src/it/check-multi/modules/pom.xml index 402baef3..813df77d 100644 --- a/src/it/check-multi/modules/pom.xml +++ b/src/it/check-multi/modules/pom.xml @@ -22,7 +22,7 @@ 4.0.0 spotbugs-maven-plugin.it - multi + check-multi testing ../pom.xml diff --git a/src/it/check-multi/pom.xml b/src/it/check-multi/pom.xml index 03424452..ccb0cabc 100644 --- a/src/it/check-multi/pom.xml +++ b/src/it/check-multi/pom.xml @@ -25,8 +25,8 @@ testing ../common.xml - multi - multi + check-multi + check-multi pom modules diff --git a/src/it/check-nofail/pom.xml b/src/it/check-nofail/pom.xml index 8507dd99..b3a83b57 100644 --- a/src/it/check-nofail/pom.xml +++ b/src/it/check-nofail/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + check-nofail + check-nofail jar diff --git a/src/it/encoding-utf8/pom.xml b/src/it/encoding-utf8/pom.xml index 5c939a46..0b2dfa14 100644 --- a/src/it/encoding-utf8/pom.xml +++ b/src/it/encoding-utf8/pom.xml @@ -26,7 +26,7 @@ testing ../common.xml - basic-1 + encoding-utf8 encoding-utf8 jar diff --git a/src/it/exclude-multi-list/pom.xml b/src/it/exclude-multi-list/pom.xml index 3c351c63..77c04f87 100644 --- a/src/it/exclude-multi-list/pom.xml +++ b/src/it/exclude-multi-list/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - excludeFile-multi-list - excludeFile-multi-list + exclude-multi-list + exclude-multi-list jar diff --git a/src/it/exclude-multi/pom.xml b/src/it/exclude-multi/pom.xml index 65918aab..0ab497fe 100644 --- a/src/it/exclude-multi/pom.xml +++ b/src/it/exclude-multi/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - excludeFile-multi - excludeFile-multi + exclude-multi + exclude-multi jar diff --git a/src/it/exclude/pom.xml b/src/it/exclude/pom.xml index c2a2c5ad..afb77c6f 100644 --- a/src/it/exclude/pom.xml +++ b/src/it/exclude/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - excludeFile - excludeFile + exclude + exclude jar diff --git a/src/it/excludeBugsFile/pom.xml b/src/it/excludeBugsFile/pom.xml index 9d1ab3c1..fbfc20a8 100644 --- a/src/it/excludeBugsFile/pom.xml +++ b/src/it/excludeBugsFile/pom.xml @@ -27,7 +27,7 @@ ../common.xml excludeBugsFiles - excludeBugsFiless + excludeBugsFiles jar diff --git a/src/it/html-report/pom.xml b/src/it/html-report/pom.xml index b400cbb1..cfe54134 100644 --- a/src/it/html-report/pom.xml +++ b/src/it/html-report/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + html-report + html-report jar diff --git a/src/it/include-multi-list/pom.xml b/src/it/include-multi-list/pom.xml index 706c1e64..b2e4c923 100644 --- a/src/it/include-multi-list/pom.xml +++ b/src/it/include-multi-list/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - includeFile-multi-list - includeFile-multi-list + include-multi-list + include-multi-list jar diff --git a/src/it/include-multi/pom.xml b/src/it/include-multi/pom.xml index ec1efa1a..71e0c8ff 100644 --- a/src/it/include-multi/pom.xml +++ b/src/it/include-multi/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - includeFile-multi - includeFile-multi + include-multi + include-multi jar diff --git a/src/it/include/pom.xml b/src/it/include/pom.xml index 32ebd4df..57a1596d 100644 --- a/src/it/include/pom.xml +++ b/src/it/include/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - includeFile - includeFile + include + include jar diff --git a/src/it/verify-clean/pom.xml b/src/it/verify-clean/pom.xml index ac597eba..51b85e2d 100644 --- a/src/it/verify-clean/pom.xml +++ b/src/it/verify-clean/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + verify-clean + verify-clean jar diff --git a/src/it/verify-fail/pom.xml b/src/it/verify-fail/pom.xml index 1544bdfe..848621d9 100644 --- a/src/it/verify-fail/pom.xml +++ b/src/it/verify-fail/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + verify-fail + verify-fail jar diff --git a/src/it/verify/pom.xml b/src/it/verify/pom.xml index ac597eba..2936c196 100644 --- a/src/it/verify/pom.xml +++ b/src/it/verify/pom.xml @@ -26,8 +26,8 @@ testing ../common.xml - check - check + verify + verify jar From d1c8b4490ca5c9ecb6fd01c9033e33fb066a84e5 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Sun, 15 Oct 2023 15:36:00 -0400 Subject: [PATCH 7/7] [config] Update spotbugs baseline files with newly uncovered hashCode fix in 4.8.0 --- .../baseline/spotbugs-baseline-other.xml | 29 ++++++++++++++++++- .../resources/baseline/spotbugs-baseline.xml | 29 ++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline-other.xml b/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline-other.xml index 34ce0c6a..5740fd5e 100644 --- a/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline-other.xml +++ b/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline-other.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + Bad comparison of signed byte Bad comparison of signed byte with 200 in AssumeUnsignedBytes.find200(byte[]) @@ -54,6 +54,33 @@ At UseOfNonHashableClassInHashDataStructure.java:[line 16] + + Use of class without a hashCode() method in a hashed data structure + UseOfNonHashableClassInHashDataStructure doesn't define a hashCode() method but is used in a hashed data structure in UseOfNonHashableClassInHashDataStructure.get(UseOfNonHashableClassInHashDataStructure) + + + At UseOfNonHashableClassInHashDataStructure.java:[lines 3-24] + + In class UseOfNonHashableClassInHashDataStructure + + + + In method UseOfNonHashableClassInHashDataStructure.get(UseOfNonHashableClassInHashDataStructure) + + + + At UseOfNonHashableClassInHashDataStructure.java:[lines 3-24] + + Unhashable class UseOfNonHashableClassInHashDataStructure + + + + Called method java.util.HashMap.get(Object) + + + At UseOfNonHashableClassInHashDataStructure.java:[line 24] + + Signature declares use of unhashable class in hashed construct UseOfNonHashableClassInHashDataStructure doesn't define a hashCode() method but it is used in a hashed context in UseOfNonHashableClassInHashDataStructure$UMap diff --git a/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline.xml b/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline.xml index 51124a2b..d1b84e29 100644 --- a/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline.xml +++ b/src/it-tools/build-tools/src/main/resources/baseline/spotbugs-baseline.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + Doomed attempt to append to an object output stream Doomed attempt to append to an object output stream in AppendingToAnObjectOutputStream.appendObject1(File, Object) @@ -122,6 +122,33 @@ At UseOfNonHashableClassInHashDataStructure.java:[line 16] + + Use of class without a hashCode() method in a hashed data structure + UseOfNonHashableClassInHashDataStructure doesn't define a hashCode() method but is used in a hashed data structure in UseOfNonHashableClassInHashDataStructure.get(UseOfNonHashableClassInHashDataStructure) + + + At UseOfNonHashableClassInHashDataStructure.java:[lines 3-24] + + In class UseOfNonHashableClassInHashDataStructure + + + + In method UseOfNonHashableClassInHashDataStructure.get(UseOfNonHashableClassInHashDataStructure) + + + + At UseOfNonHashableClassInHashDataStructure.java:[lines 3-24] + + Unhashable class UseOfNonHashableClassInHashDataStructure + + + + Called method java.util.HashMap.get(Object) + + + At UseOfNonHashableClassInHashDataStructure.java:[line 24] + + Signature declares use of unhashable class in hashed construct UseOfNonHashableClassInHashDataStructure doesn't define a hashCode() method but it is used in a hashed context in UseOfNonHashableClassInHashDataStructure$UMap