Return-Path: 
 <commits-return-21812-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
X-Original-To: apmail-commons-commits-archive@minotaur.apache.org
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 44C3B8EEA
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Mon,  5 Sep 2011 23:35:32 +0000 (UTC)
Received: (qmail 8965 invoked by uid 500); 5 Sep 2011 23:35:31 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 8897 invoked by uid 500); 5 Sep 2011 23:35:31 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 8890 invoked by uid 99); 5 Sep 2011 23:35:31 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Sep 2011 23:35:31 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Sep 2011 23:35:28 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id E9D0323889E3
	for <commits@commons.apache.org>; Mon,  5 Sep 2011 23:35:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1165454 - /commons/proper/commons-parent/trunk/pom.xml
Date: Mon, 05 Sep 2011 23:35:07 -0000
To: commits@commons.apache.org
From: sebb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110905233507.E9D0323889E3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sebb
Date: Mon Sep  5 23:35:07 2011
New Revision: 1165454

URL: http://svn.apache.org/viewvc?rev=1165454&view=rev
Log:
With release of 3.0, can now share site plugin between M2 and M3

Modified:
    commons/proper/commons-parent/trunk/pom.xml

Modified: commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1165454&r1=1165453&r2=1165454&view=diff
==============================================================================
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Mon Sep  5 23:35:07 2011
@@ -429,7 +429,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.2</version>
+        <version>3.0</version>
         <configuration>
           <!-- Exclude the navigation file for Maven 1 sites
                and the changes file used by the changes-plugin,
@@ -802,10 +802,10 @@
       </modules>
     </profile>
 
-	<!-- 
-	  Use maven-site-plugin 2.x with Maven 2.x and maven-site-plugin 3.x with Maven 3.x  
-	  See http://maven.apache.org/plugins/maven-site-plugin-3.0-beta-3/maven-3.html 
-	-->
+    <!-- 
+        Configure site plugin to support both Maven2 and Maven3, see:
+        http://maven.apache.org/plugins/maven-site-plugin/maven-3.html#Using_the_same_version_of_maven-site-plugin_for_both_Maven_2_and_Maven_3
+    -->
     <profile>
       <id>maven-3</id>
       <activation>
@@ -815,15 +815,6 @@
         </file>
       </activation>
       <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-site-plugin</artifactId>
-              <version>3.0-beta-3</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
         <plugins>
           <plugin>
             <artifactId>maven-site-plugin</artifactId>