Skip to content

Commit

Permalink
Tidy up pom.xml files
Browse files Browse the repository at this point in the history
  • Loading branch information
@ppalaga
ppalaga committed Sep 30, 2020
1 parent fa37a04 commit 9e464c3
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 25 deletions.
53 changes: 34 additions & 19 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
<inceptionYear>2019</inceptionYear>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- Compile dependency versions (keep sorted alphabetically) -->
<ahc.version>2.12.1</ahc.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
Expand Down Expand Up @@ -106,41 +103,53 @@
<testcontainers.version>1.14.3</testcontainers.version>
<zt-exec.version>1.11</zt-exec.version>

<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>

<!-- maven-enforcer-plugin -->
<supported-maven-versions>[3.5.3,)</supported-maven-versions>

<!-- Maven plugin versions (keep sorted alphabetically) -->
<cq-plugin.version>0.20.0</cq-plugin.version>
<build-helper-maven-plugin.version>3.1.0</build-helper-maven-plugin.version>
<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
<google-auth-library-credentials.version>0.19.0</google-auth-library-credentials.version>
<google-auth-library-oauth2-http.version>0.19.0</google-auth-library-oauth2-http.version>
<groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
<groovy.version>3.0.5</groovy.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
<jandex-maven-plugin.version>1.0.8</jandex-maven-plugin.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<mycila-license.version>3.0</mycila-license.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.1.0</maven-source-plugin.version>
<maven-assembly-plugin.version>3.1.1</maven-assembly-plugin.version>
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<!-- NOTE: We pin to this version due to https://github.com/apache/camel-quarkus/issues/723 -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<cq-plugin.version>0.20.0</cq-plugin.version>
<os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
<protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
<protobuf-java.version>3.11.0</protobuf-java.version>
<proto-google-common-protos.version>1.17.0</proto-google-common-protos.version>
<rpkgtests-maven-plugin.version>0.6.0</rpkgtests-maven-plugin.version>

<!-- Plugin configuration through properties -->

<!-- maven-resources-plugin -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- maven-compiler-plugin -->
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.testTarget>${maven.compiler.target}</maven.compiler.testTarget>
<maven.compiler.testSource>${maven.compiler.source}</maven.compiler.testSource>

<!-- maven-enforcer-plugin -->
<supported-maven-versions>[3.5.3,)</supported-maven-versions>

<!-- maven-release-plugin -->
<tagNameFormat>@{project.version}</tagNameFormat>
</properties>
Expand Down Expand Up @@ -277,6 +286,12 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
7 changes: 1 addition & 6 deletions poms/build-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@
<properties>
<!-- maven-surefire-plugin -->
<failIfNoTests>false</failIfNoTests>

<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
<docker-maven-plugin.version>0.3.0</docker-maven-plugin.version>
<directory-maven-plugin.version>0.3.1</directory-maven-plugin.version>
<formatter-maven-plugin.version>2.11.0</formatter-maven-plugin.version>
<impsort-maven-plugin.version>1.3.2</impsort-maven-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -158,6 +152,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
Expand Down

0 comments on commit 9e464c3

Please sign in to comment.