Skip to content

Commit

Permalink
Unify Maven plugins versions now that we have a common parent
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
gsmet committed Jun 7, 2024
1 parent 85afbe7 commit ca15630
Show file tree
Hide file tree
Showing 18 changed files with 31 additions and 85 deletions.
22 changes: 1 addition & 21 deletions build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,14 @@
<!-- Maven plugin versions -->

<!-- These properties are needed in order for them to be resolvable by the generated projects -->
<compiler-plugin.version>3.13.0</compiler-plugin.version>
<compiler-plugin.version>${version.compiler.plugin}</compiler-plugin.version>
<kotlin.version>2.0.0</kotlin.version>
<dokka.version>1.9.20</dokka.version>
<scala.version>2.13.12</scala.version>
<scala-maven-plugin.version>4.9.1</scala-maven-plugin.version>
<!-- not pretty but this is used in the codestarts and we don't want to break compatibility -->
<scala-plugin.version>${scala-maven-plugin.version}</scala-plugin.version>

<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<version.exec.plugin>3.0.0</version.exec.plugin>
<failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>

<!-- Jandex versions -->
<jandex.version>3.2.0</jandex.version>
<jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
Expand Down Expand Up @@ -127,11 +122,7 @@

<asciidoctor-maven-plugin.version>2.0.0</asciidoctor-maven-plugin.version>
<docker-maven-plugin.version>0.44.0</docker-maven-plugin.version>
<formatter-maven-plugin.version>2.24.1</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.10.0</impsort-maven-plugin.version>
<maven-invoker-plugin.version>3.7.0</maven-invoker-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<truststore-maven-plugin.version>3.0.0</truststore-maven-plugin.version>

<!-- revapi API check -->
Expand Down Expand Up @@ -414,7 +405,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand All @@ -438,7 +428,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<properties>
<predictiveSelection>
Expand All @@ -463,7 +452,6 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe-plugin.version}</version>
<configuration>
<properties>
<predictiveSelection>
Expand All @@ -484,11 +472,6 @@
<excludedEnvironmentVariables>MAVEN_OPTS</excludedEnvironmentVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${maven-dependency-plugin.version}</version>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
Expand Down Expand Up @@ -567,7 +550,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>${formatter-maven-plugin.version}</version>
<dependencies>
<dependency>
<artifactId>quarkus-ide-config</artifactId>
Expand All @@ -586,7 +568,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>${impsort-maven-plugin.version}</version>
<configuration>
<!-- store outside of target to speed up formatting when mvn clean is used -->
<cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
Expand All @@ -598,7 +579,6 @@
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven-resources-plugin.version}</version>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>eot</nonFilteredFileExtension>
Expand Down
1 change: 0 additions & 1 deletion extensions/amazon-lambda-http/maven-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<escapeString>\</escapeString>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion extensions/amazon-lambda-rest/maven-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<escapeString>\</escapeString>
</configuration>
Expand Down
1 change: 0 additions & 1 deletion extensions/amazon-lambda/maven-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<escapeString>\</escapeString>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<escapeString>\</escapeString>
</configuration>
Expand Down
8 changes: 0 additions & 8 deletions independent-projects/arc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@
<version.atinject-tck>2.0.1</version.atinject-tck>
<version.cdi-tck>4.1.0</version.cdi-tck>
<version.junit4>4.13.2</version.junit4>
<!-- Maven plugin versions -->
<version.compiler.plugin>3.13.0</version.compiler.plugin>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
</properties>

<modules>
Expand Down Expand Up @@ -190,7 +186,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -235,7 +230,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<!-- combine.self suppresses warnings about java.io.tmpdir being defined twice -->
<systemPropertyVariables combine.self="override"/>
Expand All @@ -247,7 +241,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.24.1</version>
<dependencies>
<dependency>
<artifactId>quarkus-ide-config</artifactId>
Expand All @@ -266,7 +259,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.10.0</version>
<configuration>
<!-- store outside of target to speed up formatting when mvn clean is used -->
<cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
Expand Down
7 changes: 0 additions & 7 deletions independent-projects/bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<javax.inject.version>1</javax.inject.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.compiler.plugin>3.13.0</version.compiler.plugin>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<jandex.version>3.2.0</jandex.version>
<jmh.version>1.37</jmh.version>

Expand Down Expand Up @@ -98,7 +95,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
</plugin>
<plugin>
<groupId>io.smallrye</groupId>
Expand Down Expand Up @@ -156,7 +152,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<!-- combine.self suppresses warnings about java.io.tmpdir being defined twice -->
<systemPropertyVariables combine.self="override"/>
Expand All @@ -169,7 +164,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>${formatter-maven-plugin.version}</version>
<dependencies>
<dependency>
<artifactId>quarkus-ide-config</artifactId>
Expand All @@ -188,7 +182,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>${impsort-maven-plugin.version}</version>
<configuration>
<!-- store outside of target to speed up formatting when mvn clean is used -->
<cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
Expand Down
4 changes: 0 additions & 4 deletions independent-projects/enforcer-rules/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<!-- Keeping 3.0.0.M3 because 3.2.1 requires class changes -->
<enforcer-api.version>3.0.0-M3</enforcer-api.version>
<maven-invoker-plugin.version>3.7.0</maven-invoker-plugin.version>
Expand Down Expand Up @@ -113,7 +111,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.24.1</version>
<dependencies>
<dependency>
<artifactId>quarkus-ide-config</artifactId>
Expand All @@ -132,7 +129,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.10.0</version>
<configuration>
<!-- store outside of target to speed up formatting when mvn clean is used -->
<cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
Expand Down
7 changes: 0 additions & 7 deletions independent-projects/extension-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<maven-core.version>3.9.7</maven-core.version>
<version.compiler.plugin>3.13.0</version.compiler.plugin>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<jackson-bom.version>2.17.1</jackson-bom.version>
<smallrye-beanbag.version>1.5.0</smallrye-beanbag.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
Expand All @@ -56,7 +53,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -123,7 +119,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<!-- combine.self suppresses warnings about java.io.tmpdir being defined twice -->
<systemPropertyVariables combine.self="override"/>
Expand All @@ -135,7 +130,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.24.1</version>
<dependencies>
<dependency>
<artifactId>quarkus-ide-config</artifactId>
Expand All @@ -154,7 +148,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.10.0</version>
<configuration>
<!-- store outside of target to speed up formatting when mvn clean is used -->
<cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
Expand Down
3 changes: 0 additions & 3 deletions independent-projects/ide-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
</properties>

<distributionManagement>
Expand All @@ -56,7 +54,6 @@
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<argLine>${jacoco.agent.argLine}</argLine>
</configuration>
Expand Down
6 changes: 6 additions & 0 deletions independent-projects/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<version.compiler.plugin>3.13.0</version.compiler.plugin>
<version.deploy.plugin>3.1.1</version.deploy.plugin>
<version.plugin.plugin>3.11.0</version.plugin.plugin>
<version.dependency.plugin>3.6.1</version.dependency.plugin>
<version.enforcer.plugin>3.3.0</version.enforcer.plugin>
<version.exec.plugin>3.1.0</version.exec.plugin>
<version.formatter.plugin>2.24.1</version.formatter.plugin>
Expand Down Expand Up @@ -225,6 +226,11 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${version.dependency.plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
Expand Down
7 changes: 0 additions & 7 deletions independent-projects/qute/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
<version.jandex>3.2.0</version.jandex>
<version.gizmo>1.8.0</version.gizmo>
<version.jboss-logging>3.6.0.Final</version.jboss-logging>
<version.compiler.plugin>3.13.0</version.compiler.plugin>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<version.smallrye-mutiny>2.6.0</version.smallrye-mutiny>
</properties>

Expand Down Expand Up @@ -107,7 +104,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down Expand Up @@ -152,7 +148,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<!-- combine.self suppresses warnings about java.io.tmpdir being defined twice -->
<systemPropertyVariables combine.self="override"/>
Expand All @@ -164,7 +159,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.24.1</version>
<dependencies>
<dependency>
<artifactId>quarkus-ide-config</artifactId>
Expand All @@ -183,7 +177,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.10.0</version>
<configuration>
<!-- store outside of target to speed up formatting when mvn clean is used -->
<cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
Expand Down
7 changes: 0 additions & 7 deletions independent-projects/resteasy-reactive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@
<gizmo.version>1.8.0</gizmo.version>
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>

<version.compiler.plugin>3.13.0</version.compiler.plugin>
<version.enforcer.plugin>3.2.1</version.enforcer.plugin>
<version.surefire.plugin>3.2.5</version.surefire.plugin>
<mutiny.version>2.6.0</mutiny.version>
<smallrye-common.version>2.3.0</smallrye-common.version>
<vertx.version>4.5.7</vertx.version>
Expand Down Expand Up @@ -399,7 +396,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${version.compiler.plugin}</version>
<configuration>
<parameters>true</parameters>
</configuration>
Expand Down Expand Up @@ -447,7 +443,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.surefire.plugin}</version>
<configuration>
<!-- combine.self suppresses warnings about java.io.tmpdir being defined twice -->
<systemPropertyVariables combine.self="override"/>
Expand All @@ -459,7 +454,6 @@
<plugin>
<groupId>net.revelc.code.formatter</groupId>
<artifactId>formatter-maven-plugin</artifactId>
<version>2.24.1</version>
<dependencies>
<dependency>
<artifactId>quarkus-ide-config</artifactId>
Expand All @@ -478,7 +472,6 @@
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>impsort-maven-plugin</artifactId>
<version>1.10.0</version>
<configuration>
<!-- store outside of target to speed up formatting when mvn clean is used -->
<cachedir>.cache/impsort-maven-plugin-${impsort-maven-plugin.version}</cachedir>
Expand Down
Loading

0 comments on commit ca15630

Please sign in to comment.