You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2025/07/01 17:26:00 UTC
(maven-sources) branch master updated: add Maven 3 vs 4 plugins for master switched to Maven 4 (#26)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-sources.git
The following commit(s) were added to refs/heads/master by this push:
new 2f3d049 add Maven 3 vs 4 plugins for master switched to Maven 4 (#26)
2f3d049 is described below
commit 2f3d0495cc193e048216cf614e9b9192e18189ed
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue Jul 1 19:25:54 2025 +0200
add Maven 3 vs 4 plugins for master switched to Maven 4 (#26)
* add Maven 3 vs 4 plugins for master switched to Maven 4
* add maven-filtering 4 vs 3
---
README.md | 11 +++++++++++
aggregator/plugins/pom.xml | 2 ++
aggregator/pom.xml | 1 +
default.xml | 30 +++++++++++++++++++++---------
4 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 47c56cb..fa06025 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,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
@@ -101,6 +108,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
@@ -154,6 +163,8 @@ Resulting directory tree looks like:
| |-- shared-resources
| |-- shared-utils
| `-- verifier
+|-- shared-4
+| |-- filtering
|-- sisu
| `-- sisu-project
|-- site
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/aggregator/pom.xml b/aggregator/pom.xml
index 9cc0bad..792e78b 100644
--- a/aggregator/pom.xml
+++ b/aggregator/pom.xml
@@ -62,6 +62,7 @@ under the License.
<module>plexus</module>
<module>plugins</module>
<module>shared</module>
+ <!--module>shared-4</module-->
<!--module>sisu</module--><!-- disabled: failing for unknown reason -->
<module>../../site</module>
<module>svn</module>
diff --git a/default.xml b/default.xml
index dd11ce1..0c2a125 100644
--- a/default.xml
+++ b/default.xml
@@ -38,26 +38,36 @@
<project path='core/3.x/resolver-1' name='maven-resolver.git' revision="maven-resolver-1.9.x" />
<project path='core/3.x/its-3' name='maven-integration-testing.git' revision="maven-3.9.x" />
- <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' />
@@ -95,7 +105,7 @@
<project path='shared/dependency-analyzer' name='maven-dependency-analyzer.git' />
<project path='shared/dependency-tree' name='maven-dependency-tree.git' />
<project path='shared/file-management' name='maven-file-management.git' />
- <project path='shared/filtering' name='maven-filtering.git' />
+ <project path='shared/filtering' name='maven-filtering.git' revision="maven-filtering-3.x" />
<project path='shared/invoker' name='maven-invoker.git' />
<project path='shared/jarsigner' name='maven-jarsigner.git' />
<project path='shared/mapping' name='maven-mapping.git' />
@@ -111,6 +121,8 @@
<project path='shared/shared-utils' name='maven-shared-utils.git' />
<project path='shared/verifier' name='maven-verifier.git' />
+ <project path='shared-4/filtering' name='maven-filtering.git' />
+
<project path='doxia/doxia' name='maven-doxia.git' />
<project path='doxia/site' name='maven-doxia-site.git' />
<project path='doxia/sitetools' name='maven-doxia-sitetools.git' />