You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/08/03 21:39:03 UTC

svn commit: r1153622 - /maven/pom/trunk/asf/pom.xml

Author: hboutemy
Date: Wed Aug  3 19:39:02 2011
New Revision: 1153622

URL: http://svn.apache.org/viewvc?rev=1153622&view=rev
Log:
[MPOM-23] upgraded maven-site-plugin to 3.0 both for Maven 2 & 3

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

Modified: maven/pom/trunk/asf/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1153622&r1=1153621&r2=1153622&view=diff
==============================================================================
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Wed Aug  3 19:39:02 2011
@@ -203,7 +203,7 @@ under the License.
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.3</version>
+          <version>3.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -356,28 +356,10 @@ under the License.
         </file>
       </activation>
       <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-site-plugin</artifactId>
-              <version>3.0-beta-3</version>
-              <dependencies>
-                <dependency><!-- users without native scp installed need to have the ssh wagon for site deployment at ASF -->
-                  <groupId>org.apache.maven.wagon</groupId>
-                  <artifactId>wagon-ssh</artifactId>
-                  <version>1.0-beta-7</version>
-                </dependency>
-              </dependencies>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-        <!-- we need to attach the site descriptor for this pom -->
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
-            <inherited>false</inherited>
             <executions>
               <execution>
                 <id>attach-descriptor</id>