From 18ec56d4a7d41b4bf91001d803731bc02c7f60a7 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sun, 18 Sep 2011 19:38:45 +0000 Subject: [PATCH] |MNG-5134] moved maven.version and maven.build.version just before Java system properties since they are defined (in MavenCli.java) as system property git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1172327 13f79535-47bb-0310-9956-ffa450edef68 --- maven-model-builder/src/site/apt/index.apt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maven-model-builder/src/site/apt/index.apt b/maven-model-builder/src/site/apt/index.apt index 59f630f073..58c90e496f 100644 --- a/maven-model-builder/src/site/apt/index.apt +++ b/maven-model-builder/src/site/apt/index.apt @@ -84,13 +84,9 @@ Maven Model Builder <<>> () | the directory containing the <<>> file | <<<$\{project.basedir\}>>> | *----+------+------+ | <<>>\ -<<>> () | the directory containing the <<>> file as URI | | +<<>> () | the directory containing the <<>> file as URI | <<<$\{project.baseUri\}>>> | *----+------+------+ -| <<>> | Local user settings (see {{{../maven-settings/settings.xml/settings.html}setings reference}}) | <<<$\{settings.localRepository\}>>> | -*----+------+------+ -| <<>> | The version number of the current Maven execution. For example, "3.0.3". | <<<$\{maven.version\}>>> | -*----+------+------+ -| <<>> | The full build version of the current Maven execution. For example, "Apache Maven 3.0.3 (r1075438; 2011-02-28 11:31:09-0600)". | <<<$\{maven.build.version\}>>> | +| <<>> | Local user settings (see {{{../maven-settings/settings.xml/settings.html}settings reference}}) | <<<$\{settings.localRepository\}>>> | *----+------+------+ | <<>>\ <<>> | the timestamp of build start, in <<>> default format, which can be overridden with <<>> POM property | <<<$\{maven.build.timestamp\}>>> | @@ -99,6 +95,10 @@ Maven Model Builder *----+------+------+ | <<<*>>> | model properties, such as project properties set in the pom | <<<$\{any.key\}>>> | *----+------+------+ +| <<>> | The version number of the current Maven execution. For example, "<<<3.0.3>>>". | <<<$\{maven.version\}>>> | +*----+------+------+ +| <<>> | The full build version of the current Maven execution. For example, "<<>>". | <<<$\{maven.build.version\}>>> | +*----+------+------+ | <<<*>>> | Java system properties (see {{{http://download.oracle.com/javase/1,5.0/docs/api/java/lang/System.html#getProperties()}JDK reference}}) | <<<$\{user.home\}>>>\ | | <<<$\{java.home\}>>> | *----+------+------+