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

maven-model-builder/src/site/apt/index.apt

@@ -3,7 +3,7 @@
  -----
  Hervé Boutemy
  -----
- 2011-09-03
+ 2013-03-19
  -----
 
 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\}>>> |
 *----+------+------+
 
-  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
-  {{{../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>>>)
+
+    []
+
+  []

pom.xml

@@ -65,8 +65,6 @@
     <distributionId>apache-maven</distributionId>
     <distributionShortName>Maven</distributionShortName>
     <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>
   </properties>
 
@@ -420,7 +418,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>3.2</version>
           <dependencies><!-- TODO remove when upgrading m-site-p to 3.3 -->
             <dependency>
               <groupId>org.apache.maven.doxia</groupId>
@@ -432,7 +429,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
-          <version>1.0-beta-2</version>
           <configuration>
             <content>${project.build.directory}/staging/${maven.site.path}</content>
             <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>