svn commit: r984936 - /maven/pom/trunk/maven/pom.xml

[hb...@apache.org]

Author: hboutemy
Date: Thu Aug 12 20:04:54 2010
New Revision: 984936

URL: http://svn.apache.org/viewvc?rev=984936&view=rev
Log:
o added site plugin configuration for Maven 3
o updated reporting plugins versions matching Maven 3 requirements

Modified:
    maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=984936&r1=984935&r2=984936&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Thu Aug 12 20:04:54 2010
@@ -594,6 +594,15 @@ under the License.
     </site>
   </distributionManagement>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
   <profiles>
     <profile>
       <id>quality-checks</id>
@@ -667,7 +676,7 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.1.2</version>
+            <version>2.2</version>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
@@ -677,7 +686,7 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <configuration>
               <configLocation>config/maven_checks.xml</configLocation>
               <headerLocation>config/maven-header.txt</headerLocation>
@@ -712,16 +721,12 @@ under the License.
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jxr-plugin</artifactId>
-            <version>2.1</version>
-            <configuration>
-              <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
-            </configuration>
+            <version>2.2</version>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <!-- NOTE: 2.6.x is generally unusuable due to MJAVADOC-275 -->
-            <version>2.5</version>
+            <version>2.7</version>
             <configuration>
               <encoding>${project.build.sourceEncoding}</encoding>
               <links>
@@ -760,5 +765,38 @@ under the License.
         </plugins>
       </reporting>
     </profile>
+    <profile>
+      <id>maven-3</id>
+      <activation>
+        <file>
+          <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+          <exists>${basedir}</exists>
+        </file>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <version>3.0-beta-1</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+        <plugins>
+          <plugin>
+            <artifactId>maven-site-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-descriptor</id>
+                <goals>
+                  <goal>attach-descriptor</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>