From 6bfc8f57f7b7d64dc5d0813a8c9d028ca08bda05 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:01:53 -0500 Subject: [PATCH 01/18] [build] Use compiler.plugin from parent --- pom.xml | 1 - src/it-tools/build-tools/pom.xml | 2 +- src/it-tools/prime/pom.xml | 2 +- src/it/common.xml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 536b44f0..98e9812a 100644 --- a/pom.xml +++ b/pom.xml @@ -225,7 +225,6 @@ true - 3.13.0 1.13.0 3.5.2 6.0.0 diff --git a/src/it-tools/build-tools/pom.xml b/src/it-tools/build-tools/pom.xml index 589eded3..c493fad9 100644 --- a/src/it-tools/build-tools/pom.xml +++ b/src/it-tools/build-tools/pom.xml @@ -89,7 +89,7 @@ org.apache.maven.plugins maven-compiler-plugin - @compilerPluginVersion@ + @compiler.plugin@ false 8 diff --git a/src/it-tools/prime/pom.xml b/src/it-tools/prime/pom.xml index a279ba6b..7819b851 100644 --- a/src/it-tools/prime/pom.xml +++ b/src/it-tools/prime/pom.xml @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-compiler-plugin - @compilerPluginVersion@ + @compiler.plugin@ org.apache.maven.plugins diff --git a/src/it/common.xml b/src/it/common.xml index 8027fd85..68c3234a 100644 --- a/src/it/common.xml +++ b/src/it/common.xml @@ -119,7 +119,7 @@ org.apache.maven.plugins maven-compiler-plugin - @compilerPluginVersion@ + @compiler.plugin@ org.apache.maven.plugins From e5af56b4b60320bbf9a37e4344647a2501919a78 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:04:09 -0500 Subject: [PATCH 02/18] [build] User surefire.plugin from parent --- pom.xml | 1 - src/it-tools/build-tools/pom.xml | 2 +- src/it-tools/prime/pom.xml | 2 +- src/it/common.xml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 98e9812a..2467169d 100644 --- a/pom.xml +++ b/pom.xml @@ -226,7 +226,6 @@ 1.13.0 - 3.5.2 6.0.0 7.6.6 diff --git a/src/it-tools/build-tools/pom.xml b/src/it-tools/build-tools/pom.xml index c493fad9..30e0745c 100644 --- a/src/it-tools/build-tools/pom.xml +++ b/src/it-tools/build-tools/pom.xml @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-surefire-plugin - @mavenSurefireVersion@ + @surefire.plugin@ true diff --git a/src/it-tools/prime/pom.xml b/src/it-tools/prime/pom.xml index 7819b851..08379d48 100644 --- a/src/it-tools/prime/pom.xml +++ b/src/it-tools/prime/pom.xml @@ -112,7 +112,7 @@ org.apache.maven.plugins maven-surefire-plugin - @mavenSurefireVersion@ + @surefire.plugin@ diff --git a/src/it/common.xml b/src/it/common.xml index 68c3234a..564458a1 100644 --- a/src/it/common.xml +++ b/src/it/common.xml @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-surefire-plugin - @mavenSurefireVersion@ + @surefire.plugin@ true From b92104771460d0c5c10c0e2f46365cb1b354858c Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:05:55 -0500 Subject: [PATCH 03/18] [build] Remove javadoc from build as provided via parent --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2467169d..f9e94841 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,6 @@ 0.22-1 4.1.1 3.9.0 - 3.11.2 3.14.0 2.1.0 @@ -763,11 +762,6 @@ true - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadocPluginVersion} - org.apache.maven.plugins maven-plugin-report-plugin From ef9719135af9c8a1fb61a8508e4ffde1b54d9dde Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:07:01 -0500 Subject: [PATCH 04/18] [build] Use findsecbugs and sb.contrib from parent --- pom.xml | 4 ++-- src/it/check-pluginList-repo/pom.xml | 4 ++-- src/it/pluginList-repo/pom.xml | 4 ++-- src/it/pluginList/pom.xml | 4 ++-- src/it/systemPropertyVariables/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index f9e94841..e76d178a 100644 --- a/pom.xml +++ b/pom.xml @@ -224,9 +224,9 @@ true - 1.13.0 + 1.13.0 6.0.0 - 7.6.6 + 7.6.8 7.1.0.202411261347-r diff --git a/src/it/check-pluginList-repo/pom.xml b/src/it/check-pluginList-repo/pom.xml index d2126efe..03a6a3ba 100644 --- a/src/it/check-pluginList-repo/pom.xml +++ b/src/it/check-pluginList-repo/pom.xml @@ -45,12 +45,12 @@ com.mebigfatguy.sb-contrib sb-contrib - @sb-contribVersion@ + @sb-contrib.version@ com.h3xstream.findsecbugs findsecbugs-plugin - @findsecbugsVersion@ + @findsecbugs.version@ diff --git a/src/it/pluginList-repo/pom.xml b/src/it/pluginList-repo/pom.xml index bb1db0c3..36fa831c 100644 --- a/src/it/pluginList-repo/pom.xml +++ b/src/it/pluginList-repo/pom.xml @@ -43,12 +43,12 @@ com.mebigfatguy.sb-contrib sb-contrib - @sb-contribVersion@ + @sb-contrib.version@ com.h3xstream.findsecbugs findsecbugs-plugin - @findsecbugsVersion@ + @findsecbugs.version@ diff --git a/src/it/pluginList/pom.xml b/src/it/pluginList/pom.xml index 5d9ec1d5..89609b58 100644 --- a/src/it/pluginList/pom.xml +++ b/src/it/pluginList/pom.xml @@ -41,8 +41,8 @@ true - https://repo1.maven.org/maven2/com/mebigfatguy/sb-contrib/sb-contrib/@sb-contribVersion@/sb-contrib-@sb-contribVersion@.jar, - https://repo1.maven.org/maven2/com/h3xstream/findsecbugs/findsecbugs-plugin/@findsecbugsVersion@/findsecbugs-plugin-@findsecbugsVersion@.jar + https://repo1.maven.org/maven2/com/mebigfatguy/sb-contrib/sb-contrib/@sb-contrib-version@/sb-contrib-@sb-contrib.version@.jar, + https://repo1.maven.org/maven2/com/h3xstream/findsecbugs/findsecbugs-plugin/@findsecbugs.version@/findsecbugs-plugin-@findsecbugs.version@.jar diff --git a/src/it/systemPropertyVariables/pom.xml b/src/it/systemPropertyVariables/pom.xml index 9d54e9ed..5197c90a 100644 --- a/src/it/systemPropertyVariables/pom.xml +++ b/src/it/systemPropertyVariables/pom.xml @@ -46,7 +46,7 @@ com.h3xstream.findsecbugs findsecbugs-plugin - @findsecbugsVersion@ + @findsecbugs.version@ From f8f2346ecd701a9bb5f970f4ecd6d8c3b61782b1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:08:15 -0500 Subject: [PATCH 05/18] [pom] Add more comments to pom on our usage of dependencies --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e76d178a..dff29374 100644 --- a/pom.xml +++ b/pom.xml @@ -297,6 +297,7 @@ spotbugs ${spotbugsVersion} + org.apache.logging.log4j log4j-core @@ -304,7 +305,7 @@ - + org.apache.logging.log4j log4j-to-slf4j @@ -343,6 +344,7 @@ org.apache.groovy groovy-ant + org.apache.ant ant-antlr @@ -456,6 +458,7 @@ ${mavenVersion} provided + javax.inject javax.inject @@ -486,10 +489,12 @@ doxia-core ${doxiaVersion} + commons-logging commons-logging + org.codehaus.plexus plexus-container-default @@ -511,18 +516,22 @@ doxia-site-renderer ${doxiaSiteToolsVersion} + commons-logging commons-logging + dom4j dom4j + org.codehaus.plexus plexus-container-default + org.apache.maven.doxia doxia-module-xhtml @@ -534,6 +543,7 @@ doxia-integration-tools ${doxiaSiteToolsVersion} + org.codehaus.plexus plexus-container-default @@ -601,6 +611,7 @@ plexus-resources ${plexusResourcesVersion} + javax.inject javax.inject From 123c63d4035627157272fdcb00e3ab8f26418721 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:09:33 -0500 Subject: [PATCH 06/18] [pom] Drop project info reports as defined from parent --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index dff29374..07c5d5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -783,10 +783,6 @@ - - org.apache.maven.plugins - maven-project-info-reports-plugin - org.codehaus.mojo l10n-maven-plugin From 24e682b69e38ddb95e5398b7a4248c3bdd17345a Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:09:52 -0500 Subject: [PATCH 07/18] [pom] Drop versions maven plugin as defined in parent --- pom.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pom.xml b/pom.xml index 07c5d5a0..c8196b25 100644 --- a/pom.xml +++ b/pom.xml @@ -839,19 +839,6 @@ - - org.codehaus.mojo - versions-maven-plugin - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - From e01caf8ff9ca104fdc97a97ea4ed202a0ca75dd7 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:10:06 -0500 Subject: [PATCH 08/18] [pom] Drop maven project info reports plugin as defined in parent --- pom.xml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/pom.xml b/pom.xml index c8196b25..5f240c81 100644 --- a/pom.xml +++ b/pom.xml @@ -816,29 +816,6 @@ ${project.basedir}/src/main/tools/spotbugs-exclude-filters.xml - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - ci-management - dependency-info - dependencies - dependency-convergence - dependency-management - index - issue-management - licenses - mailing-lists - plugin-management - team - scm - summary - - - - From 193d0acc3206c5767e601671b6643705468871f7 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:10:48 -0500 Subject: [PATCH 09/18] [pom] Move gson to dependency management --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 5f240c81..7ec86a6c 100644 --- a/pom.xml +++ b/pom.xml @@ -286,6 +286,13 @@ bcel ${bcel.version} + + + + com.google.code.gson + gson + ${gson.version} + @@ -320,13 +327,6 @@ slf4j-simple - - - com.google.code.gson - gson - ${gson.version} - - org.apache.ant From 55f61feb8e2a1b61a137cca02277add1f7c428e4 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:13:48 -0500 Subject: [PATCH 10/18] [pom] Move all overridden maven artifacts from doxia to dependency management we do not use these, but we require them on compile scope and further expect they are up to date. --- pom.xml | 110 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 54 deletions(-) diff --git a/pom.xml b/pom.xml index 7ec86a6c..1fb007cb 100644 --- a/pom.xml +++ b/pom.xml @@ -293,6 +293,62 @@ gson ${gson.version} + + + + commons-beanutils + commons-beanutils + ${beanutils.version} + + + + commons-logging + commons-logging + + + + + commons-chain + commons-chain + ${chain.version} + + + commons-codec + commons-codec + ${codec.version} + + + commons-collections + commons-collections + ${collections.version} + + + commons-digester + commons-digester + ${digester.version} + + + + commons-logging + commons-logging + + + + + commons-io + commons-io + ${io.version} + + + commons-lang + commons-lang + ${lang2.version} + + + org.apache.commons + commons-lang3 + ${lang3.version} + @@ -551,60 +607,6 @@ - - - commons-beanutils - commons-beanutils - ${beanutils.version} - - - commons-logging - commons-logging - - - - - commons-chain - commons-chain - ${chain.version} - - - commons-codec - commons-codec - ${codec.version} - - - commons-collections - commons-collections - ${collections.version} - - - commons-digester - commons-digester - ${digester.version} - - - commons-logging - commons-logging - - - - - commons-io - commons-io - ${io.version} - - - commons-lang - commons-lang - ${lang2.version} - - - org.apache.commons - commons-lang3 - ${lang3.version} - - org.codehaus.plexus From 56bf76bc483397aeaa5f092192c01468f5512128 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:14:29 -0500 Subject: [PATCH 11/18] [pom] Override Saxon HE from spotbugs in dependency management as all others are at 12.5 --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 1fb007cb..b6c01ee3 100644 --- a/pom.xml +++ b/pom.xml @@ -246,6 +246,7 @@ 2.0.0 2.6 3.17.0 + 12.5 com.github.spotbugs.maven @@ -294,6 +295,13 @@ ${gson.version} + + + net.sf.saxon + Saxon-HE + ${saxon.he.version} + + commons-beanutils From f0cb9a12d8ead92b2a9e4ba52cf589dea587eaa8 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:15:29 -0500 Subject: [PATCH 12/18] [build] Use single spotbugs field --- pom.xml | 3 +-- src/it-tools/prime/pom.xml | 2 +- src/it/common.xml | 2 +- src/site/apt/index.apt.vm | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b6c01ee3..2b1c571d 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,6 @@ 4.9.0 5.11.3 - 4.9.0 4.8.6 2.0.16 @@ -366,7 +365,7 @@ com.github.spotbugs spotbugs - ${spotbugsVersion} + ${spotbugs.version} diff --git a/src/it-tools/prime/pom.xml b/src/it-tools/prime/pom.xml index 08379d48..d7a16e84 100644 --- a/src/it-tools/prime/pom.xml +++ b/src/it-tools/prime/pom.xml @@ -85,7 +85,7 @@ com.github.spotbugs spotbugs - @spotbugsVersion@ + @spotbugs.version@ org.junit.jupiter diff --git a/src/it/common.xml b/src/it/common.xml index 564458a1..03410ea0 100644 --- a/src/it/common.xml +++ b/src/it/common.xml @@ -32,7 +32,7 @@ com.github.spotbugs spotbugs - @spotbugsVersion@ + @spotbugs.version@ org.junit.jupiter diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index ee3d07d0..3f103801 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -23,7 +23,7 @@ SpotBugs Maven Plugin -*Please Note - This version is using Spotbugs ${spotbugsVersion}. +*Please Note - This version is using Spotbugs ${spotbugs.version}. SpotBugs looks for bugs in Java programs. It is based on the concept of bug patterns. A bug pattern is a code idiom that is often an error. Bug patterns arise for a variety of reasons: From d723a061617fe4bb2f7eca96616ac53d9f7e5468 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:20:41 -0500 Subject: [PATCH 13/18] [pom] Bump sb-contrib to 7.6.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b1c571d..fc93a704 100644 --- a/pom.xml +++ b/pom.xml @@ -225,7 +225,7 @@ 1.13.0 6.0.0 - 7.6.8 + 7.6.9 7.1.0.202411261347-r From 7d0300dea59c3aa6b1d266e50e2f3d41ba4c2d88 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:20:51 -0500 Subject: [PATCH 14/18] [pom] Bump spotbugs tag to 4.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc93a704..96e3de32 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ 4.9.0 5.11.3 - 4.8.6 + 4.9.0 2.0.16 1.10.15 From a0393bf4db86aaf116d39804032ef7d6ac02773b Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:21:04 -0500 Subject: [PATCH 15/18] [pom] Bump junit to 5.11.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96e3de32..48d3bf35 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ 4.9.0 - 5.11.3 + 5.11.4 4.9.0 2.0.16 From d5a22ae33ddfc6bd018aaba23efc544c23e943bd Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:35:49 -0500 Subject: [PATCH 16/18] [pom] Mark doxia 2 blocked items more clearly --- pom.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 48d3bf35..bfe73937 100644 --- a/pom.xml +++ b/pom.xml @@ -196,18 +196,17 @@ 4.0.2 3.0.1 - - 10.0.4 - 1.12.0 - 3.6.2 - 3.12.1 - 2.17.1 + 10.0.4 + 1.12.0 + 3.14.0 + 3.6.2 + 3.12.1 + 2.17.1 1.1.0 0.22-1 4.1.1 3.9.0 - 3.14.0 2.1.0 false From 7f8c9ebcbc3fa1c248e9bfac186f585c86ba7e80 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:40:16 -0500 Subject: [PATCH 17/18] [pom] Reuse spotbugs.version instead of spotbugsTag being separate (they are always the same) renovate cannot update this because of how it was written, this fixes that. --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bfe73937..692ab367 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,6 @@ 4.9.0 5.11.4 - 4.9.0 2.0.16 1.10.15 @@ -957,7 +956,7 @@ jgit ${includesTestSrcPattern} - ${spotbugsTag} + ${spotbugs.version} tag From 4b4d35bf139f7d1f9ed7b5de37cc7a761bbb20c1 Mon Sep 17 00:00:00 2001 From: Jeremy Landis Date: Mon, 20 Jan 2025 19:55:28 -0500 Subject: [PATCH 18/18] Correct sb-contrib.version --- src/it/pluginList/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/it/pluginList/pom.xml b/src/it/pluginList/pom.xml index 89609b58..335bd1cc 100644 --- a/src/it/pluginList/pom.xml +++ b/src/it/pluginList/pom.xml @@ -41,7 +41,7 @@ true - https://repo1.maven.org/maven2/com/mebigfatguy/sb-contrib/sb-contrib/@sb-contrib-version@/sb-contrib-@sb-contrib.version@.jar, + https://repo1.maven.org/maven2/com/mebigfatguy/sb-contrib/sb-contrib/@sb-contrib.version@/sb-contrib-@sb-contrib.version@.jar, https://repo1.maven.org/maven2/com/h3xstream/findsecbugs/findsecbugs-plugin/@findsecbugs.version@/findsecbugs-plugin-@findsecbugs.version@.jar