diff --git a/api/maven-api-cli/pom.xml b/api/maven-api-cli/pom.xml index 00f2015a75e7..e9b0c620f59c 100644 --- a/api/maven-api-cli/pom.xml +++ b/api/maven-api-cli/pom.xml @@ -65,8 +65,10 @@ modello velocity + xdoc xsd + generate-sources diff --git a/api/maven-api-metadata/pom.xml b/api/maven-api-metadata/pom.xml index c7886d5d9a4f..1932115753e6 100644 --- a/api/maven-api-metadata/pom.xml +++ b/api/maven-api-metadata/pom.xml @@ -42,40 +42,28 @@ under the License. org.codehaus.modello modello-maven-plugin + + ${project.basedir}/../../src/mdo + 1.2.0 + + src/main/mdo/metadata.mdo + + + + + + packageModelV4=org.apache.maven.api.metadata + + - plugin + modello velocity - - generate-sources - - ${project.basedir}/../../src/mdo - 1.2.0 - - src/main/mdo/metadata.mdo - - - - - - packageModelV4=org.apache.maven.api.metadata - - - - - plugin-doc - xdoc xsd - generate-resources - - 1.2.0 - - src/main/mdo/metadata.mdo - - + generate-sources diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml index de1951415ed0..11023a08abf4 100644 --- a/api/maven-api-model/pom.xml +++ b/api/maven-api-model/pom.xml @@ -47,26 +47,29 @@ under the License. org.codehaus.modello modello-maven-plugin + + 4.1.0 + ${project.basedir}/../../src/mdo + + src/main/mdo/maven.mdo + + + + + + packageModelV4=org.apache.maven.api.model + isMavenModel=true + + - velocity + modello velocity + xdoc + xsd - - 4.1.0 - ${project.basedir}/../../src/mdo - - src/main/mdo/maven.mdo - - - - - - packageModelV4=org.apache.maven.api.model - isMavenModel=true - - + generate-sources diff --git a/api/maven-api-plugin/pom.xml b/api/maven-api-plugin/pom.xml index c74e187bfac7..b811cedee1a7 100644 --- a/api/maven-api-plugin/pom.xml +++ b/api/maven-api-plugin/pom.xml @@ -53,9 +53,11 @@ under the License. modello-maven-plugin - plugin + modello-plugin velocity + xdoc + xsd generate-sources @@ -73,24 +75,12 @@ under the License. - plugin-doc + modello-lifecycle + velocity xdoc xsd - generate-resources - - 2.0.0 - - src/main/mdo/plugin.mdo - - - - - lifecycle - - velocity - generate-sources ${project.basedir}/../../src/mdo @@ -106,20 +96,6 @@ under the License. - - lifecycle-doc - - xdoc - xsd - - generate-sources - - 1.0.0 - - src/main/mdo/lifecycle.mdo - - - diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml index 4e8b6291f212..cb6298b4251e 100644 --- a/api/maven-api-settings/pom.xml +++ b/api/maven-api-settings/pom.xml @@ -53,41 +53,30 @@ under the License. org.codehaus.modello modello-maven-plugin + + 2.0.0 + ${project.basedir}/../../src/mdo + + src/main/mdo/settings.mdo + + + + + + packageModelV4=org.apache.maven.api.settings + locationTracking=true + generateLocationClasses=true + + - velocity + modello velocity - - - 2.0.0 - ${project.basedir}/../../src/mdo - - src/main/mdo/settings.mdo - - - - - - packageModelV4=org.apache.maven.api.settings - locationTracking=true - generateLocationClasses=true - - - - - modello-site-docs - xdoc xsd generate-resources - - 2.0.0 - - src/main/mdo/settings.mdo - - diff --git a/api/maven-api-toolchain/pom.xml b/api/maven-api-toolchain/pom.xml index 663148bb1353..105d2973b0e7 100644 --- a/api/maven-api-toolchain/pom.xml +++ b/api/maven-api-toolchain/pom.xml @@ -46,27 +46,30 @@ under the License. org.codehaus.modello modello-maven-plugin + + 1.2.0 + ${project.basedir}/../../src/mdo + + src/main/mdo/toolchains.mdo + + + + + + packageModelV4=org.apache.maven.api.toolchain + locationTracking=true + generateLocationClasses=true + + - velocity + modello velocity + xdoc + xsd - - 1.2.0 - ${project.basedir}/../../src/mdo - - src/main/mdo/toolchains.mdo - - - - - - packageModelV4=org.apache.maven.api.toolchain - locationTracking=true - generateLocationClasses=true - - + generate-resources diff --git a/api/pom.xml b/api/pom.xml index 28585d8d0e71..4cf4549a1846 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -49,27 +49,6 @@ api - - - - - org.codehaus.modello - modello-maven-plugin - - - modello-site-docs - - xdoc - xsd - - none - - - - - - - reporting diff --git a/compat/maven-model/pom.xml b/compat/maven-model/pom.xml index 27f9af731a65..2935494b678f 100644 --- a/compat/maven-model/pom.xml +++ b/compat/maven-model/pom.xml @@ -95,20 +95,6 @@ under the License. - - modello-site-docs - - xdoc - - pre-site - - - modello-schema - - xsd - - generate-resources - model-v3 diff --git a/impl/maven-core/pom.xml b/impl/maven-core/pom.xml index 5a919513eb62..75f59d090efb 100644 --- a/impl/maven-core/pom.xml +++ b/impl/maven-core/pom.xml @@ -215,31 +215,6 @@ under the License. org.eclipse.sisu sisu-maven-plugin - - org.codehaus.modello - modello-maven-plugin - - 1.1.0 - - - - - - - modello-site-doc - - xdoc - - pre-site - - 1.0.0 - - src/main/mdo/extension.mdo - - - - - org.codehaus.mojo buildnumber-maven-plugin diff --git a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java index 0bc9b9b86d31..859821ceac0f 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java +++ b/impl/maven-core/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java @@ -358,11 +358,13 @@ public String id() { @Override public Collection phases() { + // START SNIPPET: clean return List.of(phase( Phase.CLEAN, plugin( MAVEN_PLUGINS + "maven-clean-plugin:" + MAVEN_CLEAN_PLUGIN_VERSION + ":clean", Phase.CLEAN))); + // END SNIPPET: clean } @Override @@ -379,6 +381,7 @@ public String id() { @Override public Collection phases() { + // START SNIPPET: default return List.of(phase( ALL, phase(VALIDATE, phase(INITIALIZE)), @@ -410,6 +413,7 @@ public Collection phases() { phase(INTEGRATION_TEST)), phase(INSTALL, after(PACKAGE)), phase(DEPLOY, after(PACKAGE)))); + // END SNIPPET: default } @Override @@ -468,12 +472,14 @@ public String id() { @Override public Collection phases() { + // START SNIPPET: site return List.of( phase(PHASE_SITE, plugin(MAVEN_SITE_PLUGIN + "site", PHASE_SITE)), phase( PHASE_SITE_DEPLOY, after(PHASE_SITE), plugin(MAVEN_SITE_PLUGIN + "deploy", PHASE_SITE_DEPLOY))); + // END SNIPPET: site } @Override diff --git a/impl/maven-core/src/site/apt/lifecycles.apt.vm b/impl/maven-core/src/site/apt/lifecycles.apt.vm index 5fa8d9ee0d0c..d5c132476af7 100644 --- a/impl/maven-core/src/site/apt/lifecycles.apt.vm +++ b/impl/maven-core/src/site/apt/lifecycles.apt.vm @@ -25,7 +25,7 @@ Lifecycles Reference - Maven defines 4 lifecycles in {{{./apidocs/org/apache/maven/lifecycle/providers/package-summary.html}<<>>}} package: + Maven defines 3 lifecycles in {{{./apidocs/org/apache/maven/lifecycle/providers/package-summary.html}<<>>}} package: %{toc|fromDepth=2} @@ -34,22 +34,16 @@ Lifecycles Reference <<>> lifecycle is defined only with phases, <> any associated plugin binding: plugins bindings for this lifecycle are {{{./default-bindings.html}defined separately for each packaging}}: -%{snippet|id=default|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/DefaultLifecycleProvider.java} +%{snippet|id=default|file=${project.basedir}/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java} * <<>> Lifecycle <<>> lifecycle phases are defined with their plugins bindings: -%{snippet|id=clean|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/CleanLifecycleProvider.java} +%{snippet|id=clean|file=${project.basedir}/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java} * <<>> Lifecycle <<>> lifecycle phases are defined with their plugins bindings: -%{snippet|id=site|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/SiteLifecycleProvider.java} - -* <<>> Lifecycle - - <<>> lifecycle phases are defined with their plugins bindings: - -%{snippet|id=wrapper|file=${project.basedir}/src/main/java/org/apache/maven/lifecycle/providers/WrapperLifecycleProvider.java} +%{snippet|id=site|file=${project.basedir}/src/main/java/org/apache/maven/internal/impl/DefaultLifecycleRegistry.java} diff --git a/impl/maven-impl/src/site/apt/dependency-types.apt b/impl/maven-impl/src/site/apt/dependency-types.apt new file mode 100644 index 000000000000..10bb5f02a06a --- /dev/null +++ b/impl/maven-impl/src/site/apt/dependency-types.apt @@ -0,0 +1,74 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one +~~ or more contributor license agreements. See the NOTICE file +~~ distributed with this work for additional information +~~ regarding copyright ownership. The ASF licenses this file +~~ to you under the Apache License, Version 2.0 (the +~~ "License"); you may not use this file except in compliance +~~ with the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, +~~ software distributed under the License is distributed on an +~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +~~ KIND, either express or implied. See the License for the +~~ specific language governing permissions and limitations +~~ under the License. + + --- + Default Dependency Types + --- + Hervé Boutemy + --- + 2024-12-27 + --- + +Default Dependency Types Reference + + Defined in <<>> + ({{{./apidocs/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.html}javadoc}}, + {{{./xref/org/apache/maven/internal/impl/resolver/type/DefaultTypeProvider.html}source}}): + +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +|| type || classifier || extension || language || path types || includesDependencies || +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +|| Maven || || || || || || +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | | <= type> | none | | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> * | | <<>> | none | | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | | <<>> | java | classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +|| Java || || || || || || +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | | <= type> | java | classes, modules | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | <<>> | <<>> | java | | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | <<>> | <<>> | java | classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | <<>> | <<>> | java | classes, patch module | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> * | <<>> | <<>> | java | modules | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> * | <<>> | <<>> | java | classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> * | <<>> | <<>> | java | classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +|| Java/Jakarta EE || || || || || || +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | | <<>> | java | classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | <<>> | <<>> | java | classes | | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | | <= type> | java | | <<>> | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | | <= type> | java | | <<>> | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> | | <= type> | java | | <<>> | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ +| <<>> * | | <= type> | java | | <<>> | +*-----------------------+---------------+------------+-----------+-----------------------+-----------------------+ + + * = new in Maven 4 \ No newline at end of file diff --git a/pom.xml b/pom.xml index c1806ff2989e..de984a9199f0 100644 --- a/pom.xml +++ b/pom.xml @@ -709,16 +709,6 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - - - modello-site-docs - - xdoc - xsd - - pre-site - - diff --git a/src/site/site.xml b/src/site/site.xml index 2d6435fb8b0e..7a2e94d68ee3 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -47,9 +47,13 @@ under the License. - - - + + + + + + +