[MNG-5878] project.directory property can override artifactId in url
inheritance

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

Branch: refs/heads/jigsaw
Commit: 14182b82fc63ec61ff771f5ba3b8c0a0babeadfd
Parents: 96a7557
Author: Hervé Boutemy <[email protected]>
Authored: Tue Jul 12 22:57:35 2016 +0200
Committer: Hervé Boutemy <[email protected]>
Committed: Tue Jul 12 22:58:44 2016 +0200

----------------------------------------------------------------------
 maven-model/src/main/mdo/maven.mdo | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/14182b82/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo 
b/maven-model/src/main/mdo/maven.mdo
index 313fd19..03c6583 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -245,7 +245,7 @@
           <description>
             <![CDATA[
             The URL to the project's homepage.
-            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
artifactId, or just parent value if 
+            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
(artifactId or project.directory property), or just parent value if 
             project's <code>child.inherit.append.path="false"</code>
             ]]>
           </description>
@@ -2174,7 +2174,7 @@
             <a href="https://maven.apache.org/scm/scm-url-format.html";>URL 
format</a>
             and <a href="https://maven.apache.org/scm/scms-overview.html";>list 
of supported SCMs</a>.
             This connection is read-only.
-            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
artifactId, or just parent value if 
+            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
(artifactId or project.directory property), or just parent value if 
             scm's <code>child.inherit.append.path="false"</code>
             ]]>
           </description>
@@ -2187,7 +2187,7 @@
             <![CDATA[
             Just like <code>connection</code>, but for developers, i.e. this 
scm connection
             will not be read only.
-            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
artifactId, or just parent value if 
+            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
(artifactId or project.directory property), or just parent value if 
             scm's <code>child.inherit.append.path="false"</code>
             ]]>
           </description>
@@ -2206,7 +2206,7 @@
           <description>
             <![CDATA[
             The URL to the project's browsable SCM repository, such as ViewVC 
or Fisheye.
-            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
artifactId, or just parent value if 
+            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
(artifactId or project.directory property), or just parent value if 
             scm's <code>child.inherit.append.path="false"</code>
             ]]>
           </description>
@@ -2673,7 +2673,7 @@
           <description>
             <![CDATA[
             The url of the location where website is deployed, in the form 
<code>protocol://hostname/path</code>.
-            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
artifactId, or just parent value if 
+            <br /><b>Default value is</b>: parent value [+ path adjustment] + 
(artifactId or project.directory property), or just parent value if 
             site's <code>child.inherit.append.path="false"</code>
             ]]>
           </description>

Reply via email to