This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-7571 in repository https://gitbox.apache.org/repos/asf/maven.git
commit 917e3b851733faae4c02d3fe2fb91ff10b44b3f3 Author: Hervé Boutemy <[email protected]> AuthorDate: Thu Dec 29 15:37:56 2022 +0100 fix review feedback --- api/maven-api-core/pom.xml | 2 +- api/maven-api-core/src/site/site.xml | 2 +- api/maven-api-meta/pom.xml | 2 +- api/maven-api-meta/src/site/site.xml | 2 +- api/maven-api-model/pom.xml | 4 ++-- api/maven-api-model/src/site/apt/index.apt | 2 +- api/maven-api-model/src/site/site.xml | 2 +- api/maven-api-settings/pom.xml | 4 ++-- api/maven-api-settings/src/site/apt/index.apt | 2 +- api/maven-api-settings/src/site/site.xml | 2 +- api/maven-api-toolchain/pom.xml | 4 ++-- api/maven-api-toolchain/src/site/apt/index.apt | 2 +- api/maven-api-toolchain/src/site/site.xml | 2 +- api/maven-api-xml/src/site/site.xml | 2 +- api/modello-plugin-velocity/src/site/site.xml | 2 +- api/pom.xml | 4 ++++ api/src/site/site.xml | 2 +- maven-artifact/src/site/site.xml | 2 +- maven-bom/src/site/site.xml | 2 +- maven-builder-support/src/site/site.xml | 2 +- maven-compat/src/site/site.xml | 2 +- maven-core/src/site/site.xml | 2 +- maven-embedder/src/site/site.xml | 2 +- maven-model-builder/src/site/site.xml | 2 +- maven-model-transform/src/site/site.xml | 2 +- maven-model/src/site/site.xml | 2 +- maven-plugin-api/src/site/site.xml | 2 +- maven-repository-metadata/src/site/site.xml | 2 +- maven-resolver-provider/src/site/site.xml | 2 +- maven-settings-builder/src/site/site.xml | 2 +- maven-settings/src/site/site.xml | 2 +- maven-slf4j-provider/src/site/site.xml | 2 +- maven-slf4j-wrapper/src/site/site.xml | 2 +- maven-toolchain-builder/src/site/site.xml | 2 +- maven-toolchain-model/src/site/site.xml | 2 +- src/site/site.xml | 2 +- 36 files changed, 42 insertions(+), 38 deletions(-) diff --git a/api/maven-api-core/pom.xml b/api/maven-api-core/pom.xml index 3895448fb..1ba9fb04b 100644 --- a/api/maven-api-core/pom.xml +++ b/api/maven-api-core/pom.xml @@ -27,7 +27,7 @@ </parent> <artifactId>maven-api-core</artifactId> - <name>Maven 4 API - Core</name> + <name>Maven 4 API :: Core</name> <description>Maven 4 API - Maven Core APIs.</description> <dependencies> diff --git a/api/maven-api-core/src/site/site.xml b/api/maven-api-core/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/maven-api-core/src/site/site.xml +++ b/api/maven-api-core/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/api/maven-api-meta/pom.xml b/api/maven-api-meta/pom.xml index b7d3b3aef..54b602fd3 100644 --- a/api/maven-api-meta/pom.xml +++ b/api/maven-api-meta/pom.xml @@ -28,6 +28,6 @@ <artifactId>maven-api-meta</artifactId> <name>Maven 4 API Meta annotations</name> - <description>Java 5 annotations for Maven 4 Immutable API.</description> + <description>Java annotations for Maven 4 Immutable API.</description> </project> diff --git a/api/maven-api-meta/src/site/site.xml b/api/maven-api-meta/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/maven-api-meta/src/site/site.xml +++ b/api/maven-api-meta/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/api/maven-api-model/pom.xml b/api/maven-api-model/pom.xml index e50497794..e141aac08 100644 --- a/api/maven-api-model/pom.xml +++ b/api/maven-api-model/pom.xml @@ -28,8 +28,8 @@ under the License. <artifactId>maven-api-model</artifactId> - <name>Maven 4 API - Model</name> - <description>Maven 4 API - immutable Model for Maven POM (Project Object Model)</description> + <name>Maven 4 API :: Model</name> + <description>Maven 4 API - Immutable Model for Maven POM (Project Object Model)</description> <dependencies> <dependency> diff --git a/api/maven-api-model/src/site/apt/index.apt b/api/maven-api-model/src/site/apt/index.apt index ca6c7a40e..e64b4fb21 100644 --- a/api/maven-api-model/src/site/apt/index.apt +++ b/api/maven-api-model/src/site/apt/index.apt @@ -25,7 +25,7 @@ 2011-06-12 ----- -Maven 4 API - immutable Maven Model +Maven 4 API - Immutable Maven Model This is strictly the immutable model for Maven POM (Project Object Model), so really just plain objects in <<<org.apache.maven.api.model>>> package. diff --git a/api/maven-api-model/src/site/site.xml b/api/maven-api-model/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/maven-api-model/src/site/site.xml +++ b/api/maven-api-model/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/api/maven-api-settings/pom.xml b/api/maven-api-settings/pom.xml index b6111a9c0..843274f0e 100644 --- a/api/maven-api-settings/pom.xml +++ b/api/maven-api-settings/pom.xml @@ -28,8 +28,8 @@ under the License. <artifactId>maven-api-settings</artifactId> - <name>Maven 4 API - Settings</name> - <description>Maven 4 API - immutable Settings model</description> + <name>Maven 4 API :: Settings</name> + <description>Maven 4 API - Immutable Settings model</description> <dependencies> <dependency> diff --git a/api/maven-api-settings/src/site/apt/index.apt b/api/maven-api-settings/src/site/apt/index.apt index f00c3a885..ca71c0d7f 100644 --- a/api/maven-api-settings/src/site/apt/index.apt +++ b/api/maven-api-settings/src/site/apt/index.apt @@ -23,7 +23,7 @@ 2006-11-04 ----- -Maven 4 API - immutable Settings Model +Maven 4 API - Immutable Settings Model This is strictly the immutable model for Maven settings in <<<org.apache.maven.api.settings>>> package. diff --git a/api/maven-api-settings/src/site/site.xml b/api/maven-api-settings/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/maven-api-settings/src/site/site.xml +++ b/api/maven-api-settings/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/api/maven-api-toolchain/pom.xml b/api/maven-api-toolchain/pom.xml index 1ae77aefa..20024cb8a 100644 --- a/api/maven-api-toolchain/pom.xml +++ b/api/maven-api-toolchain/pom.xml @@ -27,8 +27,8 @@ under the License. <artifactId>maven-api-toolchain</artifactId> - <name>Maven 4 API - Toolchain</name> - <description>Maven 4 API - immutable Toolchain model.</description> + <name>Maven 4 API :: Toolchain</name> + <description>Maven 4 API - Immutable Toolchain model.</description> <dependencies> <dependency> diff --git a/api/maven-api-toolchain/src/site/apt/index.apt b/api/maven-api-toolchain/src/site/apt/index.apt index 485321e13..689b04433 100644 --- a/api/maven-api-toolchain/src/site/apt/index.apt +++ b/api/maven-api-toolchain/src/site/apt/index.apt @@ -23,7 +23,7 @@ 2006-11-04 ----- -Maven 4 API - immutable Toolchains Model +Maven 4 API - Immutable Toolchains Model This is strictly the immutable model for Maven toolchains in <<<org.apache.maven.api.toolchain>>> package. diff --git a/api/maven-api-toolchain/src/site/site.xml b/api/maven-api-toolchain/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/maven-api-toolchain/src/site/site.xml +++ b/api/maven-api-toolchain/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/api/maven-api-xml/src/site/site.xml b/api/maven-api-xml/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/maven-api-xml/src/site/site.xml +++ b/api/maven-api-xml/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/api/modello-plugin-velocity/src/site/site.xml b/api/modello-plugin-velocity/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/modello-plugin-velocity/src/site/site.xml +++ b/api/modello-plugin-velocity/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/api/pom.xml b/api/pom.xml index dbb00f9a8..d425fee16 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -41,6 +41,10 @@ <module>maven-api-core</module> </modules> + <properties> + <project.directory>api</project.directory> + </properties> + <profiles> <profile> <id>reporting</id> diff --git a/api/src/site/site.xml b/api/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/api/src/site/site.xml +++ b/api/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-artifact/src/site/site.xml b/maven-artifact/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-artifact/src/site/site.xml +++ b/maven-artifact/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-bom/src/site/site.xml b/maven-bom/src/site/site.xml index 7f2adda9a..e6ace5735 100644 --- a/maven-bom/src/site/site.xml +++ b/maven-bom/src/site/site.xml @@ -39,7 +39,7 @@ under the License. <menu name="Overview"> <item name="Introduction" href="index.html"/> - <!--item name="JavaDocs" href="apidocs/index.html"/> + <!--item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-builder-support/src/site/site.xml b/maven-builder-support/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-builder-support/src/site/site.xml +++ b/maven-builder-support/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-compat/src/site/site.xml b/maven-compat/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-compat/src/site/site.xml +++ b/maven-compat/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-core/src/site/site.xml b/maven-core/src/site/site.xml index ee0671d4c..09663df66 100644 --- a/maven-core/src/site/site.xml +++ b/maven-core/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-embedder/src/site/site.xml b/maven-embedder/src/site/site.xml index 908e741f8..c1bd4a7df 100644 --- a/maven-embedder/src/site/site.xml +++ b/maven-embedder/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-model-builder/src/site/site.xml b/maven-model-builder/src/site/site.xml index 7aaee5a6b..61e47a68f 100644 --- a/maven-model-builder/src/site/site.xml +++ b/maven-model-builder/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-model-transform/src/site/site.xml b/maven-model-transform/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-model-transform/src/site/site.xml +++ b/maven-model-transform/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-model/src/site/site.xml b/maven-model/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-model/src/site/site.xml +++ b/maven-model/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-plugin-api/src/site/site.xml b/maven-plugin-api/src/site/site.xml index 224f30ecf..519623c9e 100644 --- a/maven-plugin-api/src/site/site.xml +++ b/maven-plugin-api/src/site/site.xml @@ -27,7 +27,7 @@ <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-repository-metadata/src/site/site.xml b/maven-repository-metadata/src/site/site.xml index c24e1433e..be08a3317 100644 --- a/maven-repository-metadata/src/site/site.xml +++ b/maven-repository-metadata/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <!--item name="Source Xref" href="xref/index.html"/--> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-resolver-provider/src/site/site.xml b/maven-resolver-provider/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-resolver-provider/src/site/site.xml +++ b/maven-resolver-provider/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-settings-builder/src/site/site.xml b/maven-settings-builder/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-settings-builder/src/site/site.xml +++ b/maven-settings-builder/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-settings/src/site/site.xml b/maven-settings/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-settings/src/site/site.xml +++ b/maven-settings/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-slf4j-provider/src/site/site.xml b/maven-slf4j-provider/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-slf4j-provider/src/site/site.xml +++ b/maven-slf4j-provider/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-slf4j-wrapper/src/site/site.xml b/maven-slf4j-wrapper/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-slf4j-wrapper/src/site/site.xml +++ b/maven-slf4j-wrapper/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-toolchain-builder/src/site/site.xml b/maven-toolchain-builder/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-toolchain-builder/src/site/site.xml +++ b/maven-toolchain-builder/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/maven-toolchain-model/src/site/site.xml b/maven-toolchain-model/src/site/site.xml index e475330c4..8ffe43d07 100644 --- a/maven-toolchain-model/src/site/site.xml +++ b/maven-toolchain-model/src/site/site.xml @@ -27,7 +27,7 @@ under the License. <body> <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> </menu> diff --git a/src/site/site.xml b/src/site/site.xml index 83da6d7d0..3ba52bda5 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -39,7 +39,7 @@ under the License. <menu name="Overview"> <item name="Introduction" href="index.html"/> - <item name="JavaDocs" href="apidocs/index.html"/> + <item name="Javadocs" href="apidocs/index.html"/> <item name="Source Xref" href="xref/index.html"/> <!--item name="FAQ" href="faq.html"/--> <item name="License" href="http://www.apache.org/licenses/"/>
