This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch plugins-4 in repository https://gitbox.apache.org/repos/asf/maven-sources.git
commit c6493dc023a6e0920fce1894f923dc5a5b9eb4eb Author: Hervé Boutemy <hbout...@apache.org> AuthorDate: Mon May 26 00:05:07 2025 +0200 add Maven 3 vs 4 plugins for master switched to Maven 4 --- README.md | 9 +++++++++ aggregator/plugins/pom.xml | 2 ++ default.xml | 26 ++++++++++++++++++-------- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3d88e8a..d602b29 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,13 @@ Resulting directory tree looks like: | | |-- maven-site-plugin | | |-- maven-verifier-plugin | | `-- surefire +| |-- core-4 +| | |-- maven-clean-plugin +| | |-- maven-compiler-plugin +| | |-- maven-deploy-plugin +| | |-- maven-install-plugin +| | |-- maven-resources-plugin +| | |-- maven-site-plugin | |-- packaging | | |-- maven-acr-plugin | | |-- maven-ear-plugin @@ -100,6 +107,8 @@ Resulting directory tree looks like: | | |-- maven-shade-plugin | | |-- maven-source-plugin | | `-- maven-war-plugin +| |-- packaging-4 +| | `-- maven-source-plugin | |-- reporting | | |-- jxr | | |-- maven-changelog-plugin diff --git a/aggregator/plugins/pom.xml b/aggregator/plugins/pom.xml index 1482312..fc01ca6 100644 --- a/aggregator/plugins/pom.xml +++ b/aggregator/plugins/pom.xml @@ -33,7 +33,9 @@ under the License. <name>Aggregator POM for Plugins</name> <modules> <module>core</module> + <!--module>core-4</module--> <module>packaging</module> + <!--module>packaging-4</module--> <module>reporting</module> <module>tools</module> </modules> diff --git a/default.xml b/default.xml index ff58554..ed7910a 100644 --- a/default.xml +++ b/default.xml @@ -38,26 +38,36 @@ <project path='core/resolver-ant-tasks' name='maven-resolver-ant-tasks.git' /> <project path='core/wrapper' name='maven-wrapper.git' /> - <project path='plugins/core/maven-clean-plugin' name='maven-clean-plugin.git' /> - <project path='plugins/core/maven-compiler-plugin' name='maven-compiler-plugin.git' /> - <project path='plugins/core/maven-deploy-plugin' name='maven-deploy-plugin.git' /> - <project path='plugins/core/maven-install-plugin' name='maven-install-plugin.git' /> - <project path='plugins/core/maven-resources-plugin' name='maven-resources-plugin.git' /> - <project path='plugins/core/maven-site-plugin' name='maven-site-plugin.git' /> + <project path='plugins/core/maven-clean-plugin' name='maven-clean-plugin.git' revision="maven-clean-plugin-3.x" /> + <project path='plugins/core/maven-compiler-plugin' name='maven-compiler-plugin.git' revision="maven-compiler-plugin-3.x" /> + <project path='plugins/core/maven-deploy-plugin' name='maven-deploy-plugin.git' revision="maven-deploy-plugin-3.x" /> + <project path='plugins/core/maven-install-plugin' name='maven-install-plugin.git' revision="maven-install-plugin-3.x" /> + <project path='plugins/core/maven-resources-plugin' name='maven-resources-plugin.git' revision="maven-resources-plugin-3.x" /> + <project path='plugins/core/maven-site-plugin' name='maven-site-plugin.git' revision="maven-site-plugin-3.x" /> <project path='plugins/core/surefire' name='maven-surefire.git' /> <project path='plugins/core/maven-verifier-plugin' name='maven-verifier-plugin.git' /> + <project path='plugins/core-4/maven-clean-plugin' name='maven-clean-plugin.git' /> + <project path='plugins/core-4/maven-compiler-plugin' name='maven-compiler-plugin.git' /> + <project path='plugins/core-4/maven-deploy-plugin' name='maven-deploy-plugin.git' /> + <project path='plugins/core-4/maven-install-plugin' name='maven-install-plugin.git' /> + <project path='plugins/core-4/maven-resources-plugin' name='maven-resources-plugin.git' /> + <project path='plugins/core-4/maven-site-plugin' name='maven-site-plugin.git' /> + <project path='plugins/packaging/maven-ear-plugin' name='maven-ear-plugin.git' /> <project path='plugins/packaging/maven-ejb-plugin' name='maven-ejb-plugin.git' /> - <project path='plugins/packaging/maven-jar-plugin' name='maven-jar-plugin.git' /> + <project path='plugins/packaging/maven-jar-plugin' name='maven-jar-plugin.git' revision="maven-jar-plugin-3.x" /> <project path='plugins/packaging/maven-rar-plugin' name='maven-rar-plugin.git' /> <project path='plugins/packaging/maven-war-plugin' name='maven-war-plugin.git' /> <project path='plugins/packaging/maven-acr-plugin' name='maven-acr-plugin.git' /> <project path='plugins/packaging/maven-shade-plugin' name='maven-shade-plugin.git' /> - <project path='plugins/packaging/maven-source-plugin' name='maven-source-plugin.git' /> + <project path='plugins/packaging/maven-source-plugin' name='maven-source-plugin.git' revision="maven-source-plugin-3.x" /> <project path='plugins/packaging/maven-jlink-plugin' name='maven-jlink-plugin.git' /> <project path='plugins/packaging/maven-jmod-plugin' name='maven-jmod-plugin.git' /> + <project path='plugins/packaging-4/maven-jar-plugin' name='maven-jar-plugin.git' /> + <project path='plugins/packaging-4/maven-source-plugin' name='maven-source-plugin.git' /> + <project path='plugins/reporting/maven-changelog-plugin' name='maven-changelog-plugin.git' /> <project path='plugins/reporting/maven-changes-plugin' name='maven-changes-plugin.git' /> <project path='plugins/reporting/maven-checkstyle-plugin' name='maven-checkstyle-plugin.git' />