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 2016/09/04 15:34:55 UTC

maven git commit: MNG-5878 improved explanations

Repository: maven
Updated Branches:
  refs/heads/master 4dde52072 -> 7846f081a


MNG-5878 improved explanations

Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/7846f081
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/7846f081
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/7846f081

Branch: refs/heads/master
Commit: 7846f081a696baa6c88b0420b684829fb97e1d4d
Parents: 4dde520
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Sep 4 17:34:44 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Sun Sep 4 17:34:44 2016 +0200

----------------------------------------------------------------------
 maven-model-builder/src/site/apt/index.apt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/7846f081/maven-model-builder/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt
index f2bed91..80fb6a9 100644
--- a/maven-model-builder/src/site/apt/index.apt
+++ b/maven-model-builder/src/site/apt/index.apt
@@ -65,10 +65,11 @@ Maven Model Builder
 
    ** inheritance assembly: <<<InheritanceAssembler>>> ({{{./apidocs/org/apache/maven/model/inheritance/InheritanceAssembler.html}javadoc}}),
    with its <<<DefaultInheritanceAssembler>>> implementation
-   ({{{./xref/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.html}source}}). Notice that
-   <<<project.url>>>, <<<project.scm.connection>>>, <<<project.scm.developerConnection>>>, <<<project.scm.url>>> and
-   <<<project.distributionManagement.site.url>>> have a special treatment: if not overridden in child, the default value is parent's one
-   with child artifact id appended, or <<<project.directory>>> property value if directory is not equals to artifact id
+   ({{{./xref/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.html}source}}).\
+   Notice that the 5 urls from the model (<<<project.url>>>, <<<project.scm.connection>>>, <<<project.scm.developerConnection>>>,
+   <<<project.scm.url>>> and <<<project.distributionManagement.site.url>>>) have a special treatment:
+   if not configured in child, the default value is parent's one with child artifact id appended,
+   or since Maven 3.4.0 <<<project.directory>>> POM property value if defined (when module directory name is not equal to artifact id)
 
    ** model interpolation (see below)