From bcd1811155470407b8e7279809993f2830de6ea4 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Tue, 23 Apr 2024 11:57:55 +0200 Subject: [PATCH] Unify Maven plugins versions now that we have a common parent We used to specify versions in all the independent projects and it's not necessary anymore. Also fixes a few issues related to resource filtering as the updated version of the plugin seems to be a bit pickier. --- build-parent/pom.xml | 22 +------------------ .../maven-archetype/pom.xml | 1 - .../maven-archetype/pom.xml | 1 - .../amazon-lambda/maven-archetype/pom.xml | 1 - .../maven-archetype/pom.xml | 1 - independent-projects/arc/pom.xml | 8 ------- independent-projects/bootstrap/pom.xml | 7 ------ independent-projects/enforcer-rules/pom.xml | 4 ---- .../extension-maven-plugin/pom.xml | 7 ------ independent-projects/ide-config/pom.xml | 3 --- independent-projects/parent/pom.xml | 6 +++++ independent-projects/qute/pom.xml | 7 ------ .../resteasy-reactive/pom.xml | 7 ------ independent-projects/revapi/pom.xml | 2 -- independent-projects/tools/pom.xml | 13 ----------- integration-tests/awt/pom.xml | 16 ++++++++++++++ integration-tests/maven/pom.xml | 6 +++++ .../projects/test-source-sets/pom.xml | 4 ++-- 18 files changed, 31 insertions(+), 85 deletions(-) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 1f99b5a1349c2..c8338a34f37dd 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -19,7 +19,7 @@ - 3.13.0 + ${version.compiler.plugin} 2.0.0 1.9.20 2.13.12 @@ -27,11 +27,6 @@ ${scala-maven-plugin.version} - 3.2.1 - 3.2.5 - 3.0.0 - ${version.surefire.plugin} - 3.2.0 1.0.0 @@ -127,11 +122,7 @@ 2.0.0 0.44.0 - 2.24.1 - 1.10.0 3.7.0 - 3.1.0 - 3.1.2 3.0.0 @@ -414,7 +405,6 @@ maven-compiler-plugin - ${compiler-plugin.version} org.codehaus.mojo @@ -438,7 +428,6 @@ maven-surefire-plugin - ${version.surefire.plugin} @@ -463,7 +452,6 @@ maven-failsafe-plugin - ${failsafe-plugin.version} @@ -484,11 +472,6 @@ MAVEN_OPTS - - org.apache.maven.plugins - maven-dependency-plugin - ${maven-dependency-plugin.version} - io.quarkus quarkus-maven-plugin @@ -567,7 +550,6 @@ net.revelc.code.formatter formatter-maven-plugin - ${formatter-maven-plugin.version} quarkus-ide-config @@ -586,7 +568,6 @@ net.revelc.code impsort-maven-plugin - ${impsort-maven-plugin.version} .cache/impsort-maven-plugin-${impsort-maven-plugin.version} @@ -598,7 +579,6 @@ maven-resources-plugin - ${maven-resources-plugin.version} eot diff --git a/extensions/amazon-lambda-http/maven-archetype/pom.xml b/extensions/amazon-lambda-http/maven-archetype/pom.xml index dce1a1e348f69..091f4b4706fde 100644 --- a/extensions/amazon-lambda-http/maven-archetype/pom.xml +++ b/extensions/amazon-lambda-http/maven-archetype/pom.xml @@ -42,7 +42,6 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 \ diff --git a/extensions/amazon-lambda-rest/maven-archetype/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/pom.xml index 326475ac1feed..680ef2a853592 100644 --- a/extensions/amazon-lambda-rest/maven-archetype/pom.xml +++ b/extensions/amazon-lambda-rest/maven-archetype/pom.xml @@ -42,7 +42,6 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 \ diff --git a/extensions/amazon-lambda/maven-archetype/pom.xml b/extensions/amazon-lambda/maven-archetype/pom.xml index 32e7bcd3439bf..9f66f8680405f 100644 --- a/extensions/amazon-lambda/maven-archetype/pom.xml +++ b/extensions/amazon-lambda/maven-archetype/pom.xml @@ -49,7 +49,6 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 \ diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml b/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml index 6b0414ec4538f..5e3fae37eabf3 100644 --- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml +++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/pom.xml @@ -42,7 +42,6 @@ org.apache.maven.plugins maven-resources-plugin - 3.1.0 \ diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml index 9ff168d1e0e04..cdbee5c1113fb 100644 --- a/independent-projects/arc/pom.xml +++ b/independent-projects/arc/pom.xml @@ -60,10 +60,6 @@ 2.0.1 4.1.0 4.13.2 - - 3.13.0 - 3.2.1 - 3.2.5 @@ -190,7 +186,6 @@ maven-compiler-plugin - ${version.compiler.plugin} maven-javadoc-plugin @@ -235,7 +230,6 @@ maven-surefire-plugin - ${version.surefire.plugin} @@ -247,7 +241,6 @@ net.revelc.code.formatter formatter-maven-plugin - 2.24.1 quarkus-ide-config @@ -266,7 +259,6 @@ net.revelc.code impsort-maven-plugin - 1.10.0 .cache/impsort-maven-plugin-${impsort-maven-plugin.version} diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index 7155808b3eac0..ae20107f0ddb6 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -34,9 +34,6 @@ 1.3.2 1 UTF-8 - 3.13.0 - 3.2.1 - 3.2.5 3.2.0 1.37 @@ -98,7 +95,6 @@ maven-compiler-plugin - ${version.compiler.plugin} io.smallrye @@ -156,7 +152,6 @@ maven-surefire-plugin - ${version.surefire.plugin} @@ -169,7 +164,6 @@ net.revelc.code.formatter formatter-maven-plugin - ${formatter-maven-plugin.version} quarkus-ide-config @@ -188,7 +182,6 @@ net.revelc.code impsort-maven-plugin - ${impsort-maven-plugin.version} .cache/impsort-maven-plugin-${impsort-maven-plugin.version} diff --git a/independent-projects/enforcer-rules/pom.xml b/independent-projects/enforcer-rules/pom.xml index b211d5a499555..377ba62b81e71 100644 --- a/independent-projects/enforcer-rules/pom.xml +++ b/independent-projects/enforcer-rules/pom.xml @@ -32,8 +32,6 @@ UTF-8 - 3.2.1 - 3.2.5 3.0.0-M3 3.7.0 @@ -113,7 +111,6 @@ net.revelc.code.formatter formatter-maven-plugin - 2.24.1 quarkus-ide-config @@ -132,7 +129,6 @@ net.revelc.code impsort-maven-plugin - 1.10.0 .cache/impsort-maven-plugin-${impsort-maven-plugin.version} diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml index df803bed44a63..d45da6dfe91fe 100644 --- a/independent-projects/extension-maven-plugin/pom.xml +++ b/independent-projects/extension-maven-plugin/pom.xml @@ -38,9 +38,6 @@ 11 11 3.9.7 - 3.13.0 - 3.2.1 - 3.2.5 2.17.1 1.5.0 5.10.2 @@ -56,7 +53,6 @@ maven-compiler-plugin - ${version.compiler.plugin} maven-javadoc-plugin @@ -123,7 +119,6 @@ maven-surefire-plugin - ${version.surefire.plugin} @@ -135,7 +130,6 @@ net.revelc.code.formatter formatter-maven-plugin - 2.24.1 quarkus-ide-config @@ -154,7 +148,6 @@ net.revelc.code impsort-maven-plugin - 1.10.0 .cache/impsort-maven-plugin-${impsort-maven-plugin.version} diff --git a/independent-projects/ide-config/pom.xml b/independent-projects/ide-config/pom.xml index eb6715db28729..565d4973efb8e 100644 --- a/independent-projects/ide-config/pom.xml +++ b/independent-projects/ide-config/pom.xml @@ -36,8 +36,6 @@ UTF-8 - 3.2.1 - 3.2.5 @@ -56,7 +54,6 @@ maven-surefire-plugin - ${version.surefire.plugin} ${jacoco.agent.argLine} diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index 57c49fde7ca1a..c0760f4469ce8 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -23,6 +23,7 @@ 3.13.0 3.1.1 3.11.0 + 3.6.1 3.3.0 3.1.0 2.24.1 @@ -225,6 +226,11 @@ maven-compiler-plugin ${version.compiler.plugin} + + org.apache.maven.plugins + maven-dependency-plugin + ${version.dependency.plugin} + org.apache.maven.plugins maven-gpg-plugin diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml index fd662f88d1c97..332c2c1f52f8d 100644 --- a/independent-projects/qute/pom.xml +++ b/independent-projects/qute/pom.xml @@ -43,9 +43,6 @@ 3.2.0 1.8.0 3.6.0.Final - 3.13.0 - 3.2.1 - 3.2.5 2.6.0 @@ -107,7 +104,6 @@ maven-compiler-plugin - ${version.compiler.plugin} maven-javadoc-plugin @@ -152,7 +148,6 @@ maven-surefire-plugin - ${version.surefire.plugin} @@ -164,7 +159,6 @@ net.revelc.code.formatter formatter-maven-plugin - 2.24.1 quarkus-ide-config @@ -183,7 +177,6 @@ net.revelc.code impsort-maven-plugin - 1.10.0 .cache/impsort-maven-plugin-${impsort-maven-plugin.version} diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index 811d1a40236a0..52ab91b97292e 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -56,9 +56,6 @@ 1.8.0 3.1.0 - 3.13.0 - 3.2.1 - 3.2.5 2.6.0 2.3.0 4.5.7 @@ -399,7 +396,6 @@ maven-compiler-plugin - ${version.compiler.plugin} true @@ -447,7 +443,6 @@ maven-surefire-plugin - ${version.surefire.plugin} @@ -459,7 +454,6 @@ net.revelc.code.formatter formatter-maven-plugin - 2.24.1 quarkus-ide-config @@ -478,7 +472,6 @@ net.revelc.code impsort-maven-plugin - 1.10.0 .cache/impsort-maven-plugin-${impsort-maven-plugin.version} diff --git a/independent-projects/revapi/pom.xml b/independent-projects/revapi/pom.xml index b7803ece8e03d..e40eeb6e15836 100644 --- a/independent-projects/revapi/pom.xml +++ b/independent-projects/revapi/pom.xml @@ -28,8 +28,6 @@ - 3.2.1 - 3.2.5 true diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml index 26958587e6ae2..4eab86a621db9 100644 --- a/independent-projects/tools/pom.xml +++ b/independent-projects/tools/pom.xml @@ -55,8 +55,6 @@ 1.26.2 3.6.0.Final 5.12.0 - 3.2.1 - 3.2.5 ${project.version} 36 3.2.0 @@ -205,14 +203,6 @@ - - - - maven-compiler-plugin - ${compiler-plugin.version} - - - org.apache.maven.plugins @@ -249,7 +239,6 @@ maven-surefire-plugin - ${version.surefire.plugin} @@ -261,7 +250,6 @@ net.revelc.code.formatter formatter-maven-plugin - 2.24.1 quarkus-ide-config @@ -280,7 +268,6 @@ net.revelc.code impsort-maven-plugin - 1.10.0 .cache/impsort-maven-plugin-${impsort-maven-plugin.version} diff --git a/integration-tests/awt/pom.xml b/integration-tests/awt/pom.xml index 8526ca2db0841..f71302da2c204 100644 --- a/integration-tests/awt/pom.xml +++ b/integration-tests/awt/pom.xml @@ -127,6 +127,22 @@ + + maven-resources-plugin + + + jpg + tiff + tif + bmp + gif + png + wbmp + jp2 + ttf + + + io.quarkus quarkus-maven-plugin diff --git a/integration-tests/maven/pom.xml b/integration-tests/maven/pom.xml index 7994167899ad7..5b24377764004 100644 --- a/integration-tests/maven/pom.xml +++ b/integration-tests/maven/pom.xml @@ -14,6 +14,12 @@ Quarkus - Integration Tests - Maven tooling + + + ${version.resources.plugin} + ${version.dependency.plugin} + + io.quarkus diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml index e01bb4e97948d..76879035d0574 100644 --- a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml +++ b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml @@ -9,7 +9,8 @@ 3.3.0 ${compiler-plugin.version} - ${maven-dependency-plugin.version} + ${version.surefire.plugin} + ${dependency-plugin.version} ${maven.compiler.release} @@ -39,7 +40,6 @@ quarkus-bom io.quarkus @project.version@ - ${version.surefire.plugin}