This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.10.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.10.x by this push:
new 379bb4ac9f Maven 3.10.x site (#12370)
379bb4ac9f is described below
commit 379bb4ac9fa94cdc96b911a7c04068256779164b
Author: Tamas Cservenak <[email protected]>
AuthorDate: Sat Jun 27 16:13:05 2026 +0200
Maven 3.10.x site (#12370)
The missing pages for:
* lifecycles
* dependency types
* default plugin bindings
* fix `null` when there is no short opt (some new options have only
longOpts)
Fixes #11966
---
.../lifecycle/CleanLifecycleProvider.java | 3 +-
.../lifecycle/DefaultLifecycleProvider.java | 2 +
.../providers/lifecycle/SiteLifecycleProvider.java | 3 +-
maven-core/src/site/apt/artifact-handlers.apt | 57 +++++++++++-----------
maven-core/src/site/apt/default-bindings.apt.vm | 14 +++---
maven-core/src/site/apt/lifecycles.apt.vm | 8 +--
.../artifact/handler/ArtifactHandlerTest.java | 18 ++-----
.../maven/cli/CLIManagerDocumentationTest.java | 14 ++++--
8 files changed, 59 insertions(+), 60 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/CleanLifecycleProvider.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/CleanLifecycleProvider.java
index cf7dc32ba9..91532fd7e3 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/CleanLifecycleProvider.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/CleanLifecycleProvider.java
@@ -32,12 +32,13 @@
@Named(CleanLifecycleProvider.NAME)
public class CleanLifecycleProvider extends AbstractLifecycleProvider {
public static final String NAME = "clean";
-
+ // START SNIPPET: clean
private static final String[] PHASES = {"pre-clean", "clean",
"post-clean"};
private static final String[] PLUGIN_BINDINGS = {
"clean", "org.apache.maven.plugins:maven-clean-plugin:" +
PluginVersions.CLEAN_PLUGIN_VERSION + ":clean"
};
+ // END SNIPPET: clean
public CleanLifecycleProvider() {
super(NAME, PHASES, PLUGIN_BINDINGS);
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/DefaultLifecycleProvider.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/DefaultLifecycleProvider.java
index 024c57d4d9..2d75cda8c3 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/DefaultLifecycleProvider.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/DefaultLifecycleProvider.java
@@ -31,6 +31,7 @@
public class DefaultLifecycleProvider extends AbstractLifecycleProvider {
public static final String NAME = "default";
+ // START SNIPPET: default
private static final String[] PHASES = {
"validate",
"initialize",
@@ -58,6 +59,7 @@ public class DefaultLifecycleProvider extends
AbstractLifecycleProvider {
};
private static final String[] PLUGIN_BINDINGS = {};
+ // END SNIPPET: default
public DefaultLifecycleProvider() {
super(NAME, PHASES, PLUGIN_BINDINGS);
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/SiteLifecycleProvider.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/SiteLifecycleProvider.java
index 53f2675145..7c53d0d36c 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/SiteLifecycleProvider.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/SiteLifecycleProvider.java
@@ -32,7 +32,7 @@
@Named(SiteLifecycleProvider.NAME)
public class SiteLifecycleProvider extends AbstractLifecycleProvider {
public static final String NAME = "site";
-
+ // START SNIPPET: site
private static final String[] PHASES = {"pre-site", "site", "post-site",
"site-deploy"};
private static final String[] PLUGIN_BINDINGS = {
@@ -41,6 +41,7 @@ public class SiteLifecycleProvider extends
AbstractLifecycleProvider {
"site-deploy",
"org.apache.maven.plugins:maven-site-plugin:" +
PluginVersions.SITE_PLUGIN_VERSION + ":deploy"
};
+ // END SNIPPET: site
public SiteLifecycleProvider() {
super(NAME, PHASES, PLUGIN_BINDINGS);
diff --git a/maven-core/src/site/apt/artifact-handlers.apt
b/maven-core/src/site/apt/artifact-handlers.apt
index 299d7d8212..649d1c15df 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -20,7 +20,7 @@
---
Hervé Boutemy
---
- 2013-08-02
+ 2026-06-25
---
Default Artifact Handlers Reference
@@ -29,31 +29,32 @@ Default Artifact Handlers Reference
define for each {{{../maven-model/maven.html#class_dependency}dependency
type}} information on the artifact
(classifier, extension, language) and how to manage it as dependency (add to
classpath, include dependencies).
- Some artifact handlers
- are configured by default in <<<META-INF/plexus/artifact-handlers.xml>>>:
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+|| type || classifier || extension || language || added to
classpath || includesDependencies ||
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<pom>>> | | <= type> | none |
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<maven-plugin>>> | | <<<jar>>> | java | <<true>>
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<jar>>> | | <= type> | java | <<true>>
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<java-source>>> | <<<sources>>> | <<<jar>>> | java |
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<javadoc>>> | <<<javadoc>>> | <<<jar>>> | java | <<true>>
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<test-jar>>> | <<<tests>>> | <<<jar>>> | java | <<true>>
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<fatjar>>> | | <<<jar>>> | java | <<true>>
| <<<true>>> |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<ejb>>> | | <<<jar>>> | java | <<true>>
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<ejb-client>>> | <<<client>>> | <<<jar>>> | java | <<true>>
| |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<war>>> | | <= type> | java |
| <<<true>>> |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<ear>>> | | <= type> | java |
| <<<true>>> |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
+| <<<rar>>> | | <= type> | java |
| <<<true>>> |
+*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-|| type || classifier || extension || packaging || language ||
added to classpath || includesDependencies ||
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<pom>>> | | <= type> | <= type> | none |
| |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<jar>>> | | <= type> | <= type> | java |
<<<true>>> | |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<test-jar>>> | <<<tests>>> | <<<jar>>> | <<<jar>>> | java |
<<<true>>> | |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<maven-plugin>>> | | <<<jar>>> | <= type> | java |
<<<true>>> | |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<ejb>>> | | <<<jar>>> | <= type> | java |
<<<true>>> | |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<ejb-client>>> | <<<client>>> | <<<jar>>> | <<<ejb>>> | java |
<<<true>>> | |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<war>>> | | <= type> | <= type> | java |
| <<<true>>> |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<ear>>> | | <= type> | <= type> | java |
| <<<true>>> |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<rar>>> | | <= type> | <= type> | java |
| <<<true>>> |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<java-source>>> | <<<sources>>> | <<<jar>>> | <= type> | java |
| |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
-| <<<javadoc>>> | <<<javadoc>>> | <<<jar>>> | <= type> | java |
<<<true>>> | |
-*--------------------+---------------+------------+------------+-----------+---------------------+-----------------------+
+ <<<fatjar>>> is new in Maven 3.10.0
\ No newline at end of file
diff --git a/maven-core/src/site/apt/default-bindings.apt.vm
b/maven-core/src/site/apt/default-bindings.apt.vm
index 50c4654b2e..e54c7b7335 100644
--- a/maven-core/src/site/apt/default-bindings.apt.vm
+++ b/maven-core/src/site/apt/default-bindings.apt.vm
@@ -32,29 +32,29 @@ Plugin Bindings for <<<default>>> Lifecycle Reference
* Plugin bindings for <<<pom>>> packaging
-%{snippet|id=pom-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
+%{snippet|id=pom|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/packaging/PomLifecycleMappingProvider.java}
* Plugin bindings for <<<jar>>> packaging
-%{snippet|id=jar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
+%{snippet|id=jar|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/packaging/JarLifecycleMappingProvider.java}
* Plugin bindings for <<<ejb>>> packaging
-%{snippet|id=ejb-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
+%{snippet|id=ejb|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/packaging/EjbLifecycleMappingProvider.java}
* Plugin bindings for <<<maven-plugin>>> packaging
-%{snippet|id=maven-plugin-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
+%{snippet|id=maven-plugin|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/packaging/MavenPluginLifecycleMappingProvider.java}
* Plugin bindings for <<<war>>> packaging
-%{snippet|id=war-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
+%{snippet|id=war|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/packaging/WarLifecycleMappingProvider.java}
* Plugin bindings for <<<ear>>> packaging
-%{snippet|id=ear-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
+%{snippet|id=ear|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/packaging/EarLifecycleMappingProvider.java}
* Plugin bindings for <<<rar>>> packaging
-%{snippet|id=rar-lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/default-bindings.xml}
+%{snippet|id=rar|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/packaging/RarLifecycleMappingProvider.java}
diff --git a/maven-core/src/site/apt/lifecycles.apt.vm
b/maven-core/src/site/apt/lifecycles.apt.vm
index 3e47bc90c7..ded9c596d1 100644
--- a/maven-core/src/site/apt/lifecycles.apt.vm
+++ b/maven-core/src/site/apt/lifecycles.apt.vm
@@ -25,7 +25,7 @@
Lifecycles Reference
- Maven defines 3 lifecycles in <<<META-INF/plexus/components.xml>>>:
+ Maven defines 3 lifecycles:
%{toc|fromDepth=2}
@@ -34,16 +34,16 @@ Lifecycles Reference
<<<default>>> lifecycle is defined <<without>> any associated plugin.
Plugin bindings for this lifecycle are {{{./default-bindings.html}defined
separately for every packaging}}:
-%{snippet|id=lifecycle|file=${project.basedir}/src/main/resources/META-INF/plexus/components.xml}
+%{snippet|id=default|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/DefaultLifecycleProvider.java}
* <<<clean>>> Lifecycle
<<<clean>>> lifecycle is defined directly with its plugin bindings.
-%{snippet|id=clean|file=${project.basedir}/src/main/resources/META-INF/plexus/components.xml}
+%{snippet|id=clean|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/CleanLifecycleProvider.java}
* <<<site>>> Lifecycle
<<<site>>> lifecycle is defined directly with its plugin bindings.
-%{snippet|id=site|file=${project.basedir}/src/main/resources/META-INF/plexus/components.xml}
+%{snippet|id=site|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/lifecycle/SiteLifecycleProvider.java}
diff --git
a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
index 8f412f1718..893e20a088 100644
---
a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
+++
b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
@@ -47,15 +47,7 @@ public void testAptConsistency() throws Exception {
if (line.startsWith("||")) {
String[] cols = line.split("\\|\\|");
String[] expected = new String[] {
- "",
- "type",
- "classifier",
- "extension",
- "packaging",
- "language",
- "added to classpath",
- "includesDependencies",
- ""
+ "", "type", "classifier", "extension", "language", "added
to classpath", "includesDependencies", ""
};
int i = 0;
@@ -68,15 +60,13 @@ public void testAptConsistency() throws Exception {
String type = trimApt(cols[1]);
String classifier = trimApt(cols[2]);
String extension = trimApt(cols[3], type);
- String packaging = trimApt(cols[4], type);
- String language = trimApt(cols[5]);
- String addedToClasspath = trimApt(cols[6]);
- String includesDependencies = trimApt(cols[7]);
+ String language = trimApt(cols[4]);
+ String addedToClasspath = trimApt(cols[5]);
+ String includesDependencies = trimApt(cols[6]);
ArtifactHandler handler =
container.lookup(ArtifactHandler.class, type);
assertEquals(handler.getExtension(), extension, type + "
extension");
- assertEquals(handler.getPackaging(), packaging, type + "
packaging");
assertEquals(handler.getClassifier(), classifier, type + "
classifier");
assertEquals(handler.getLanguage(), language, type + "
language");
assertEquals(
diff --git
a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
index ed6c159bf3..06d4e2d9f2 100644
---
a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
+++
b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
@@ -60,11 +60,15 @@ public String getOptionsAsHtml() {
"<table border='1' class='zebra-striped'><tr
class='a'><th><b>Options</b></th><th><b>Description</b></th></tr>");
for (Option option : new CLIManagerExtension().getOptions()) {
a = !a;
- sb.append("<tr class='").append(a ? 'a' :
'b').append("'><td><code>-<a name='");
- sb.append(option.getOpt());
- sb.append("'>");
- sb.append(option.getOpt());
- sb.append("</a>,--<a name='");
+ sb.append("<tr class='").append(a ? 'a' :
'b').append("'><td><code>");
+ if (option.getOpt() != null) {
+ sb.append("-<a name='");
+ sb.append(option.getOpt());
+ sb.append("'>");
+ sb.append(option.getOpt());
+ sb.append("</a>, ");
+ }
+ sb.append(" --<a name='");
sb.append(option.getLongOpt());
sb.append("'>");
sb.append(option.getLongOpt());
