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 2023/01/01 11:09:50 UTC
[maven] branch MNG-7652 updated: fix little inconsistencies
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MNG-7652
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/MNG-7652 by this push:
new 971c0b799 fix little inconsistencies
971c0b799 is described below
commit 971c0b7990ef214c9d893286099d1c7528637820
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jan 1 12:09:33 2023 +0100
fix little inconsistencies
---
maven-compat/src/main/mdo/profiles.mdo | 4 ++--
maven-model/src/site/apt/index.apt | 2 +-
maven-plugin-api/pom.xml | 5 ++++-
maven-repository-metadata/src/site/site.xml | 2 +-
maven-settings/pom.xml | 2 +-
maven-settings/src/site/apt/index.apt | 2 +-
maven-toolchain-model/pom.xml | 2 +-
.../src/site/apt/index.apt | 14 +++++++-------
8 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/maven-compat/src/main/mdo/profiles.mdo b/maven-compat/src/main/mdo/profiles.mdo
index e3e102991..2843e806e 100644
--- a/maven-compat/src/main/mdo/profiles.mdo
+++ b/maven-compat/src/main/mdo/profiles.mdo
@@ -24,8 +24,8 @@ under the License.
<id>profiles</id>
<name>Profiles</name>
<description><![CDATA[
- Project-local overrides to the build process based on detected or user-provided environmental parameters.
- This is the model specification for ${basedir}/profiles.xml.
+ <b>Deprecated in Maven 2</b> Project-local overrides to the build process based on detected or user-provided environmental parameters.
+ This is the model specification for <code>${basedir}/profiles.xml</code>.
]]></description>
<defaults>
<default>
diff --git a/maven-model/src/site/apt/index.apt b/maven-model/src/site/apt/index.apt
index f4fa80236..680358f0e 100644
--- a/maven-model/src/site/apt/index.apt
+++ b/maven-model/src/site/apt/index.apt
@@ -28,7 +28,7 @@
Maven Model
This is strictly the model for Maven POM (Project Object Model) in <<<org.apache.maven.model>>> package,
- delegating content to {{{../maven-api/maven-api-model/index.html}Maven 4 API immutable model}}. All the effective model
+ delegating content to {{{../api/maven-api-model/index.html}Maven 4 API immutable model}}. All the effective model
building logic from multiple POMs and building context is done in {{{../maven-model-builder/}Maven Model Builder}}.
The following are generated from this model:
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 4c4d92218..1294bcb7c 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -86,7 +86,10 @@ under the License.
</configuration>
</execution>
<execution>
- <id>modello-site-docs</id>
+ <id>modello-site-docs2</id>
+ <goals>
+ <goal>xdoc</goal>
+ </goals>
<phase>pre-site</phase>
<configuration>
<models>
diff --git a/maven-repository-metadata/src/site/site.xml b/maven-repository-metadata/src/site/site.xml
index be08a3317..8ffe43d07 100644
--- a/maven-repository-metadata/src/site/site.xml
+++ b/maven-repository-metadata/src/site/site.xml
@@ -28,7 +28,7 @@ under the License.
<menu name="Overview">
<item name="Introduction" href="index.html"/>
<item name="Javadocs" href="apidocs/index.html"/>
- <!--item name="Source Xref" href="xref/index.html"/-->
+ <item name="Source Xref" href="xref/index.html"/>
<!--item name="FAQ" href="faq.html"/-->
</menu>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 4c1501838..ee7051693 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -79,7 +79,7 @@ under the License.
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <version>4.0.0</version>
+ <version>2.0.0</version>
<models>
<model>target/mdo/settings.mdo</model>
</models>
diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt
index bcedeedd2..95193e910 100644
--- a/maven-settings/src/site/apt/index.apt
+++ b/maven-settings/src/site/apt/index.apt
@@ -26,7 +26,7 @@
Maven Settings Model
This is the model for Maven settings in <<<org.apache.maven.settings>>> package,
- delegating content to {{{../maven-api/maven-api-settings/index.html}Maven 4 API immutable settings}}. All the effective model
+ delegating content to {{{../api/maven-api-settings/index.html}Maven 4 API immutable settings}}. All the effective model
building logic from multiple settings files is done in {{{../maven-settings-builder/}Maven Settings Builder}}.
The following are generated from this model:
diff --git a/maven-toolchain-model/pom.xml b/maven-toolchain-model/pom.xml
index 222265ea3..01ecb03cb 100644
--- a/maven-toolchain-model/pom.xml
+++ b/maven-toolchain-model/pom.xml
@@ -78,7 +78,7 @@ under the License.
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
<configuration>
- <version>4.0.0</version>
+ <version>1.1.0</version>
<models>
<model>target/mdo/toolchains.mdo</model>
</models>
diff --git a/maven-settings/src/site/apt/index.apt b/maven-toolchain-model/src/site/apt/index.apt
similarity index 70%
copy from maven-settings/src/site/apt/index.apt
copy to maven-toolchain-model/src/site/apt/index.apt
index bcedeedd2..81e22f7ce 100644
--- a/maven-settings/src/site/apt/index.apt
+++ b/maven-toolchain-model/src/site/apt/index.apt
@@ -18,22 +18,22 @@
-----
Introduction
-----
- Vincent Siveton
+ Hervé Boutemy
-----
2006-11-04
-----
-Maven Settings Model
+Maven Toolchain Model
- This is the model for Maven settings in <<<org.apache.maven.settings>>> package,
- delegating content to {{{../maven-api/maven-api-settings/index.html}Maven 4 API immutable settings}}. All the effective model
- building logic from multiple settings files is done in {{{../maven-settings-builder/}Maven Settings Builder}}.
+ This is the model for Maven toolchain in <<<org.apache.maven.toolchain>>> package,
+ delegating content to {{{../api/maven-api-toolchain/index.html}Maven 4 API immutable toolchain}}. All the effective model
+ building logic from multiple toolchains files is done in {{{../maven-toolchain-builder/}Maven Toolchain Builder}}.
The following are generated from this model:
* {{{./apidocs/index.html}Java sources}} with Reader and Writers for the Xpp3 XML parser, <<<ToAPiV3()>>> and <<<ToApiV4()>>> transformers, and <<<v4>>> package
for Merger and v4 Reader and Writers for the Xpp3 XML parser,
- * A {{{./settings.html}Descriptor Reference}}
+ * A {{{./toolchains.html}Descriptor Reference}}
- * An {{{https://maven.apache.org/xsd/settings-1.2.0.xsd}XSD}}
+ * An {{{https://maven.apache.org/xsd/toolchains-1.1.0.xsd}XSD}}