svn commit: r1023319 - in /maven/plugins/branches/maven-site-plugin-3.x/src/site/apt: maven-3.apt maven-3.apt.vm

[olamy]

Author: olamy
Date: Sat Oct 16 15:56:11 2010
New Revision: 1023319

URL: http://svn.apache.org/viewvc?rev=1023319&view=rev
Log:
use interpolation for pom samples.

Added:
    maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm
      - copied, changed from r1023315, 
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt
Removed:
    maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt

Copied: 
maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm (from 
r1023315, maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt)
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm?p2=maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm&p1=maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt&r1=1023315&r2=1023319&rev=1023319&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt 
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/site/apt/maven-3.apt.vm 
Sat Oct 16 15:56:11 2010
@@ -91,7 +91,7 @@ Configuration format.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>@projectInfoReportsPluginVersion@</version>
+        <version>2.2</version>
         <configuration>
           <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
           <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -132,7 +132,7 @@ Configuration format.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${javadocPluginVersion}</version>
+        <version>2.2</version>
       </plugin>
 
     </plugins>
@@ -147,14 +147,14 @@ Configuration format.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>@project.version@</version>
+        <version>${project.version}</version>
         <configuration>
           .....
           <reportPlugins>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>@projectInfoReportsPluginVersion@</version>
+              <version>2.2</version>
               <configuration>
                 <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
                 <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
@@ -167,7 +167,7 @@ Configuration format.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-javadoc-plugin</artifactId>
-              <version>${javadocPluginVersion}</version>
+              <version>2.7</version>
             </plugin>
           </reportPlugins>
         </configuration>
@@ -180,9 +180,9 @@ Version Resolution
 
   Report Plugin version can be empty. The following order/strategy will be 
used to find/resolve a version:
 
-  search same groupId/artifactId in the build.plugins section.
-  search same groupId/artifactId in the build.pluginManagement.plugins section
-  resolve with current repositories (can include auto SNAPSHOT resolution)
+  * search same groupId/artifactId in the build.plugins section.
+  * search same groupId/artifactId in the build.pluginManagement.plugins 
section
+  * resolve with current repositories (can include auto SNAPSHOT resolution)
 
 Using maven-site-plugin 2.x with Maven 2.x and maven-site-plugin 3.x with 
Maven 3.x
 
@@ -207,7 +207,7 @@ Using maven-site-plugin 2.x with Maven 2
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-site-plugin</artifactId>
-              <version>3.0-beta-1</version>
+              <version>${project.version}</version>
             </plugin>
           </plugins>
         </pluginManagement>