Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven

This commit is contained in:
Jason van Zyl 2013-03-19 10:25:34 -07:00
parent c5f161a8d6 e438f1140e
commit 2d7069b6e3
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
maven-model-builder/src/site/apt/index.apt
View File

@ -3,7 +3,7 @@
----- -----
Hervé Boutemy Hervé Boutemy
----- -----
2011-09-03 2013-03-19
----- -----
Maven Model Builder Maven Model Builder
@ -120,6 +120,23 @@ Maven Model Builder
| <<<settings.*>>> | Local user settings (see {{{../maven-settings/settings.xml/settings.html}settings reference}}) | <<<$\{settings.localRepository\}>>> | | <<<settings.*>>> | Local user settings (see {{{../maven-settings/settings.xml/settings.html}settings reference}}) | <<<$\{settings.localRepository\}>>> |
*----+------+------+ *----+------+------+
Notice that after model interpolation, <<<$\{...\}>>> content can remain in the model that will be evaluated later ** Notice
* after model interpolation, <<<$\{...\}>>> content can remain in the model that will be evaluated later
when setting plugin parameters. This happens in particular with <<<settings.*>>> values for when setting plugin parameters. This happens in particular with <<<settings.*>>> values for
{{{../maven-settings/settings.html}Settings Model}}. {{{../maven-settings/settings.html}Settings Model}},
* encoding configuration have been defined as POM properties looking like POM content but not added to POM model to maintain
compatibility with previous Maven versions:
* <<<$\{project.build.sourceEncoding\}>>> for
{{{http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding}source files encoding}}
(defaults to platform encoding)
* <<<$\{project.reporting.outputEncoding\}>>> for
{{{https://cwiki.apache.org/confluence/display/MAVENOLD/Reporting+Encoding+Configuration}reporting output files encoding}}
(defaults to <<<UTF-8>>>)
[]
[]

4
pom.xml
View File

@ -65,8 +65,6 @@
<distributionId>apache-maven</distributionId> <distributionId>apache-maven</distributionId>
<distributionShortName>Maven</distributionShortName> <distributionShortName>Maven</distributionShortName>
<distributionName>Apache Maven</distributionName> <distributionName>Apache Maven</distributionName>
<siteDeployUrl>scp://people.apache.org/www/maven.apache.org/ref/${project.version}/</siteDeployUrl>
<siteUrl>http://maven.apache.org/ref/${project.version}/</siteUrl>
<maven.site.path>ref/3-LATEST</maven.site.path> <maven.site.path>ref/3-LATEST</maven.site.path>
</properties> </properties>
@ -420,7 +418,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<version>3.2</version>
<dependencies><!-- TODO remove when upgrading m-site-p to 3.3 --> <dependencies><!-- TODO remove when upgrading m-site-p to 3.3 -->
<dependency> <dependency>
<groupId>org.apache.maven.doxia</groupId> <groupId>org.apache.maven.doxia</groupId>
@ -432,7 +429,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-publish-plugin</artifactId> <artifactId>maven-scm-publish-plugin</artifactId>
<version>1.0-beta-2</version>
<configuration> <configuration>
<content>${project.build.directory}/staging/${maven.site.path}</content> <content>${project.build.directory}/staging/${maven.site.path}</content>
<checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory> <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>