This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch MENFORCER-485 in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 39f90be16beef8cba8b95298665dd813fbc96878 Author: Slawomir Jaranowski <s.jaranow...@gmail.com> AuthorDate: Tue Jun 27 00:58:55 2023 +0200 [MENFORCER-485] Upgrade Parent to 40 - upgrade parent - use versions from parent in IT --- .../src/it/projects/MENFORCER-306/parent/pom.xml | 20 +++++++++---------- .../require-plugin-versions-expressions/pom.xml | 18 ++++++++--------- .../module1/pom.xml | 13 +++++------- .../require-plugin-versions-expressions2/pom.xml | 23 +++++++++++----------- .../require-plugin-versions-mm-ci-friendly/pom.xml | 18 ++++++++--------- .../pom.xml | 2 +- .../pom.xml | 18 ++++++++--------- .../pom.xml | 6 +++--- pom.xml | 13 ++++++------ 9 files changed, 63 insertions(+), 68 deletions(-) diff --git a/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml b/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml index cdfd4c2..2cded36 100644 --- a/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/MENFORCER-306/parent/pom.xml @@ -55,52 +55,52 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>3.1.0</version> + <version>@version.maven-clean-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.5.2</version> + <version>@version.maven-install-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.7.1</version> + <version>@version.maven-site-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.8.2</version> + <version>@version.maven-deploy-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> + <version>@version.maven-compiler-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-plugin-plugin</artifactId> - <version>3.5.2</version> + <version>@version.maven-plugin-tools@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.21.0</version> + <version>@version.maven-surefire@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.1.0</version> + <version>@version.maven-jar-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>3.1.0</version> + <version>@version.maven-resources-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-wrapper-plugin</artifactId> - <version>3.0.1</version> + <version>@version.maven-wrapper-plugin@</version> </plugin> </plugins> </pluginManagement> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml index 487b348..60710f0 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml @@ -36,47 +36,47 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.5</version> + <version>@version.maven-clean-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> + <version>@version.maven-resources-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>@version.maven-compiler-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</version> + <version>@version.maven-surefire@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>@version.maven-jar-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.4</version> + <version>@version.maven-install-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> + <version>@version.maven-deploy-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.2</version> + <version>@version.maven-site-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-wrapper-plugin</artifactId> - <version>3.0.1</version> + <version>@version.maven-wrapper-plugin@</version> </plugin> <plugin> <groupId>${expressionplugin.groupId}</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml index 8f124fe..4f2857d 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/module1/pom.xml @@ -35,9 +35,6 @@ <properties> <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <checkstyle.plugin.version>3.1.1</checkstyle.plugin.version> - <pmd.plugin.version>3.13.0</pmd.plugin.version> - <surefire.version>3.0.0-M4</surefire.version> </properties> <build> @@ -46,27 +43,27 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>${maven.antrun.plugin.version}</version> + <version>@version.maven-antrun-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>${checkstyle.plugin.version}</version> + <version>@version.maven-checkstyle-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>${surefire.version}</version> + <version>@version.maven-surefire@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>${pmd.plugin.version}</version> + <version>@version.maven-pmd-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.version}</version> + <version>@version.maven-surefire@</version> </plugin> </plugins> </pluginManagement> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml index c4a0c35..1c80646 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml @@ -37,7 +37,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.antrun.plugin.version>3.0.0</maven.antrun.plugin.version> </properties> <build> @@ -46,57 +45,57 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>3.1.0</version> + <version>@version.maven-clean-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.1</version> + <version>@version.maven-compiler-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.2</version> + <version>@version.maven-dependency-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>3.0.0-M1</version> + <version>@version.maven-deploy-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M3</version> + <version>@project.version@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>3.0.0-M1</version> + <version>@version.maven-install-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.2.0</version> + <version>@version.maven-jar-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>3.1.0</version> + <version>@version.maven-project-info-reports-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>3.0.0-M1</version> + <version>@version.maven-release-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.9.1</version> + <version>@version.maven-site-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-wrapper-plugin</artifactId> - <version>3.0.1</version> + <version>@version.maven-wrapper-plugin@</version> </plugin> </plugins> </pluginManagement> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml index 9050799..3b95ee9 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml @@ -40,47 +40,47 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.5</version> + <version>@version.maven-clean-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> + <version>@version.maven-resources-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>@version.maven-compiler-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</version> + <version>@version.maven-surefire@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>@version.maven-jar-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.4</version> + <version>@version.maven-install-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> + <version>@version.maven-deploy-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.2</version> + <version>@version.maven-site-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-wrapper-plugin</artifactId> - <version>3.0.1</version> + <version>@version.maven-wrapper-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml index e114db2..9f13b5c 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml @@ -88,7 +88,7 @@ </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>2.4.3</version> + <version>@version.maven-resources-plugin@</version> </plugin> </plugins> </build> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml index 757f7f7..8a1de40 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml @@ -36,47 +36,47 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.5</version> + <version>@version.maven-clean-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> + <version>@version.maven-resources-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.5.1</version> + <version>@version.maven-compiler-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.12.4</version> + <version>@version.maven-surefire@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> + <version>@version.maven-jar-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.4</version> + <version>@version.maven-install-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> + <version>@version.maven-deploy-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.2</version> + <version>@version.maven-site-plugin@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-wrapper-plugin</artifactId> - <version>3.0.1</version> + <version>@version.maven-wrapper-plugin@</version> </plugin> </plugins> </pluginManagement> diff --git a/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml index 7550644..7d57af3 100644 --- a/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-same-versions_with-dependencies-failure/pom.xml @@ -54,12 +54,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.14</version> + <version>@version.maven-surefire@</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.14</version> + <version>@version.maven-surefire@</version> </plugin> </plugins> </build> @@ -82,7 +82,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.14</version> + <version>@version.maven-surefire@</version> </plugin> </plugins> </reporting> diff --git a/pom.xml b/pom.xml index d1803f8..62a279a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>39</version> + <version>40</version> <relativePath /> </parent> <groupId>org.apache.maven.enforcer</groupId> @@ -84,6 +84,11 @@ <project.build.outputTimestamp>2023-04-01T21:03:41Z</project.build.outputTimestamp> <!-- the same as Maven 3.2.5 --> <aether.version>1.0.0.v20140518</aether.version> + + <!-- plugins used in IT, not defined in parent --> + <version.maven-checkstyle-plugin>3.3.0</version.maven-checkstyle-plugin> + <version.maven-pmd-plugin>3.21.0</version.maven-pmd-plugin> + <version.maven-wrapper-plugin>3.2.0</version.maven-wrapper-plugin> </properties> <dependencyManagement> @@ -203,12 +208,6 @@ <build> <pluginManagement> <plugins> - <plugin> - <!-- remove with future parent upgrade --> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-invoker-plugin</artifactId> - <version>3.5.1</version> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId>