From 3fd92ae136eb1a62f2c897b7d9f81363e7b618d7 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Thu, 14 Sep 2023 12:42:28 +0300 Subject: [PATCH 1/3] [JAVA-23099] Clean up --- maven-modules/compiler-plugin-java-9/pom.xml | 2 +- maven-modules/host-maven-repo-example/pom.xml | 12 ++++++++---- .../aggregate-report/pom.xml | 6 +++++- .../jacoco-coverage-aggregation/controllers/pom.xml | 3 ++- maven-modules/jacoco-coverage-aggregation/pom.xml | 6 +++++- maven-modules/maven-build-optimization/pom.xml | 8 ++++---- maven-modules/maven-builder-plugin/pom.xml | 3 ++- maven-modules/maven-exec-plugin/pom.xml | 5 +++-- maven-modules/maven-generate-war/pom.xml | 5 +++-- maven-modules/maven-integration-test/pom.xml | 10 +++++----- maven-modules/maven-multi-source/pom.xml | 8 +++----- maven-modules/maven-parent-pom-resolution/pom.xml | 5 ++++- maven-modules/version-overriding-plugins/pom.xml | 2 +- 13 files changed, 46 insertions(+), 29 deletions(-) diff --git a/maven-modules/compiler-plugin-java-9/pom.xml b/maven-modules/compiler-plugin-java-9/pom.xml index 1063ee2e8f..54ec811374 100644 --- a/maven-modules/compiler-plugin-java-9/pom.xml +++ b/maven-modules/compiler-plugin-java-9/pom.xml @@ -22,7 +22,7 @@ - 3.8.0 + 3.11.0 9 9 diff --git a/maven-modules/host-maven-repo-example/pom.xml b/maven-modules/host-maven-repo-example/pom.xml index d5f36713d0..3bb1d721a8 100644 --- a/maven-modules/host-maven-repo-example/pom.xml +++ b/maven-modules/host-maven-repo-example/pom.xml @@ -18,7 +18,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + ${maven-source-plugin.version} attach-sources @@ -31,7 +31,7 @@ com.github.github site-maven-plugin - 0.12 + ${site-maven-plugin.version} Maven artifacts for ${project.version} true @@ -56,7 +56,7 @@ maven-deploy-plugin - 2.8.2 + ${maven-deploy-plugin.version} internal.repo::default::file://${project.build.directory}/mvn-artifact @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + ${maven-source-plugin.version} attach-sources @@ -106,6 +106,10 @@ github 8 8 + 3.1.0 + 2.8.2 + 3.1.0 + 0.12 \ No newline at end of file diff --git a/maven-modules/jacoco-coverage-aggregation/aggregate-report/pom.xml b/maven-modules/jacoco-coverage-aggregation/aggregate-report/pom.xml index 1a5d186490..1a076cacae 100644 --- a/maven-modules/jacoco-coverage-aggregation/aggregate-report/pom.xml +++ b/maven-modules/jacoco-coverage-aggregation/aggregate-report/pom.xml @@ -32,7 +32,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + ${jacoco-maven-plugin.version} verify @@ -53,4 +53,8 @@ + + 0.8.8 + + \ No newline at end of file diff --git a/maven-modules/jacoco-coverage-aggregation/controllers/pom.xml b/maven-modules/jacoco-coverage-aggregation/controllers/pom.xml index a7c213f5af..5aa54f042f 100644 --- a/maven-modules/jacoco-coverage-aggregation/controllers/pom.xml +++ b/maven-modules/jacoco-coverage-aggregation/controllers/pom.xml @@ -38,7 +38,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 + ${maven-failsafe-plugin.version} @@ -58,6 +58,7 @@ 3.0.9 + 3.1.2 \ No newline at end of file diff --git a/maven-modules/jacoco-coverage-aggregation/pom.xml b/maven-modules/jacoco-coverage-aggregation/pom.xml index 8670ff328a..d85f41968d 100644 --- a/maven-modules/jacoco-coverage-aggregation/pom.xml +++ b/maven-modules/jacoco-coverage-aggregation/pom.xml @@ -27,7 +27,7 @@ org.jacoco jacoco-maven-plugin - 0.8.8 + ${jacoco-maven-plugin.version} @@ -39,4 +39,8 @@ + + 0.8.8 + + \ No newline at end of file diff --git a/maven-modules/maven-build-optimization/pom.xml b/maven-modules/maven-build-optimization/pom.xml index 69533b4ef2..86d3b2d34f 100644 --- a/maven-modules/maven-build-optimization/pom.xml +++ b/maven-modules/maven-build-optimization/pom.xml @@ -19,12 +19,12 @@ org.apache.maven.plugins maven-profiler-plugin - ${profiler.version} + ${maven-profiler-plugin.version} org.apache.maven.plugins maven-failsafe-plugin - ${failsafe.version} + ${maven-failsafe-plugin.version} @@ -55,8 +55,8 @@ - 3.1.2 - 1.7 + 3.1.2 + 1.7 \ No newline at end of file diff --git a/maven-modules/maven-builder-plugin/pom.xml b/maven-modules/maven-builder-plugin/pom.xml index f7d6a4e69b..338aafe85d 100644 --- a/maven-modules/maven-builder-plugin/pom.xml +++ b/maven-modules/maven-builder-plugin/pom.xml @@ -12,7 +12,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + ${build-helper-maven-plugin.version} add-source @@ -32,6 +32,7 @@ + 3.2.0 1.8 1.8 UTF-8 diff --git a/maven-modules/maven-exec-plugin/pom.xml b/maven-modules/maven-exec-plugin/pom.xml index f0d4706455..1bac52ae2c 100644 --- a/maven-modules/maven-exec-plugin/pom.xml +++ b/maven-modules/maven-exec-plugin/pom.xml @@ -30,7 +30,7 @@ org.codehaus.mojo exec-maven-plugin - 3.0.0 + ${exec-maven-plugin.version} com.baeldung.main.Exec @@ -45,7 +45,8 @@ 1.2.6 - 3.8.1 + 3.11.0 + 3.1.0 1.8 diff --git a/maven-modules/maven-generate-war/pom.xml b/maven-modules/maven-generate-war/pom.xml index cf8952e72f..e05964f4f1 100644 --- a/maven-modules/maven-generate-war/pom.xml +++ b/maven-modules/maven-generate-war/pom.xml @@ -43,7 +43,7 @@ maven-war-plugin - 3.3.1 + ${maven-war-plugin.version} @@ -72,7 +72,8 @@ 11 2.17.1 - 3.10.1 + 3.11.0 + 3.4.0 11 11 diff --git a/maven-modules/maven-integration-test/pom.xml b/maven-modules/maven-integration-test/pom.xml index 4483bb2d55..69e65dff19 100644 --- a/maven-modules/maven-integration-test/pom.xml +++ b/maven-modules/maven-integration-test/pom.xml @@ -76,7 +76,7 @@ maven-compiler-plugin - ${maven.compiler.version} + ${maven-compiler-plugin.version} ${java.version} ${java.version} @@ -103,7 +103,7 @@ maven-failsafe-plugin - ${maven.failsafe.version} + ${maven-failsafe-plugin.version} @@ -267,10 +267,10 @@ - 3.3.2 + 3.4.2 3.0.2 - 3.8.0 - 2.22.0 + 3.11.0 + 3.1.2 1.1 3.0.0 3.0.0 diff --git a/maven-modules/maven-multi-source/pom.xml b/maven-modules/maven-multi-source/pom.xml index d9863b31a9..96b390d75a 100644 --- a/maven-modules/maven-multi-source/pom.xml +++ b/maven-modules/maven-multi-source/pom.xml @@ -18,7 +18,7 @@ maven-compiler-plugin - ${maven.compiler.version} + ${maven-compiler-plugin.version} ${java.version} ${java.version} @@ -30,7 +30,7 @@ org.codehaus.mojo build-helper-maven-plugin - ${maven.build.helper.version} + ${build-helper-maven-plugin.version} generate-sources @@ -80,11 +80,9 @@ 3.0.2 - 3.8.0 - 2.22.0 1.1 3.0.0 - 3.0.0 + 3.0.0 9.4.11.v20180605 2.27 diff --git a/maven-modules/maven-parent-pom-resolution/pom.xml b/maven-modules/maven-parent-pom-resolution/pom.xml index 8506f1c5fa..288bf5f780 100644 --- a/maven-modules/maven-parent-pom-resolution/pom.xml +++ b/maven-modules/maven-parent-pom-resolution/pom.xml @@ -20,10 +20,13 @@ org.apache.maven.plugins maven-dependency-plugin - 3.2.0 + ${maven-dependency-plugin.version} + + 3.2.0 + \ No newline at end of file diff --git a/maven-modules/version-overriding-plugins/pom.xml b/maven-modules/version-overriding-plugins/pom.xml index b98a444bd4..d38541d797 100644 --- a/maven-modules/version-overriding-plugins/pom.xml +++ b/maven-modules/version-overriding-plugins/pom.xml @@ -51,7 +51,7 @@ - 3.8.0 + 3.11.0 \ No newline at end of file From cc82be90516d36566f746a03723e9c3497ac410b Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Thu, 14 Sep 2023 12:45:44 +0300 Subject: [PATCH 2/3] [JAVA-23099] Clean up --- maven-modules/maven-generate-war/pom.xml | 2 -- maven-modules/maven-simple/parent-project/webapp/pom.xml | 4 ---- 2 files changed, 6 deletions(-) diff --git a/maven-modules/maven-generate-war/pom.xml b/maven-modules/maven-generate-war/pom.xml index e05964f4f1..7de3f15298 100644 --- a/maven-modules/maven-generate-war/pom.xml +++ b/maven-modules/maven-generate-war/pom.xml @@ -72,8 +72,6 @@ 11 2.17.1 - 3.11.0 - 3.4.0 11 11 diff --git a/maven-modules/maven-simple/parent-project/webapp/pom.xml b/maven-modules/maven-simple/parent-project/webapp/pom.xml index ce964c222f..d0596a4503 100644 --- a/maven-modules/maven-simple/parent-project/webapp/pom.xml +++ b/maven-modules/maven-simple/parent-project/webapp/pom.xml @@ -26,8 +26,4 @@ - - 3.3.2 - - \ No newline at end of file From d10aa5a25760cf05e5d9f1a2527eb4b263e843f4 Mon Sep 17 00:00:00 2001 From: panos-kakos Date: Thu, 14 Sep 2023 18:48:44 +0300 Subject: [PATCH 3/3] [JAVA-23099] Fixed wrong version --- maven-modules/maven-integration-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-modules/maven-integration-test/pom.xml b/maven-modules/maven-integration-test/pom.xml index 69e65dff19..ae2eddb40f 100644 --- a/maven-modules/maven-integration-test/pom.xml +++ b/maven-modules/maven-integration-test/pom.xml @@ -267,7 +267,7 @@ - 3.4.2 + 3.4.0 3.0.2 3.11.0 3.1.2