Return-Path: 
 <commits-return-56582-apmail-maven-commits-archive=maven.apache.org@maven.apache.org>
X-Original-To: apmail-maven-commits-archive@www.apache.org
Delivered-To: apmail-maven-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id E13F117C24
	for <apmail-maven-commits-archive@www.apache.org>;
 Mon, 13 Apr 2015 02:10:46 +0000 (UTC)
Received: (qmail 35683 invoked by uid 500); 13 Apr 2015 02:10:46 -0000
Delivered-To: apmail-maven-commits-archive@maven.apache.org
Received: (qmail 35618 invoked by uid 500); 13 Apr 2015 02:10:46 -0000
Mailing-List: contact commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@maven.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@maven.apache.org>
List-Post: <mailto:commits@maven.apache.org>
List-Id: <commits.maven.apache.org>
Reply-To: dev@maven.apache.org
Delivered-To: mailing list commits@maven.apache.org
Received: (qmail 35609 invoked by uid 99); 13 Apr 2015 02:10:46 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Apr 2015 02:10:46 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 8C73FAC00B7
	for <commits@maven.apache.org>; Mon, 13 Apr 2015 02:10:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1673085 -
 /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Date: Mon, 13 Apr 2015 02:10:46 -0000
To: commits@maven.apache.org
From: hboutemy@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150413021046.8C73FAC00B7@hades.apache.org>

Author: hboutemy
Date: Mon Apr 13 02:10:46 2015
New Revision: 1673085

URL: http://svn.apache.org/r1673085
Log:
[MECLIPSE-758] fixed m-plugin-p configuration for annotations

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/pom.xml

Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=1673085&r1=1673084&r2=1673085&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Mon Apr 13 02:10:46 2015
@@ -63,6 +63,7 @@ under the License.
     <mavenVersion>2.2.1</mavenVersion>
     <maven.test.jvmargs>-Xmx1024m</maven.test.jvmargs>
     <surefire.version>2.18.1</surefire.version>
+    <mavenPluginToolsVersion>3.4</mavenPluginToolsVersion>
   </properties>
 
   <dependencies>
@@ -242,6 +243,23 @@ under the License.
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>${mavenPluginToolsVersion}</version>
+          <executions>
+            <execution>
+              <id>default-descriptor</id>
+              <phase>process-classes</phase>
+            </execution>
+            <execution>
+              <id>generated-helpmojo</id>
+              <goals>
+                <goal>helpmojo</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
           <version>2.7</version>
         </plugin>
@@ -289,7 +307,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.4</version>
       </plugin>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
@@ -452,29 +469,49 @@ under the License.
               </execution>
             </executions>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>maven-2</id>
+      <activation>
+        <file>
+          <!--  This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+          <missing>${basedir}</missing>
+        </file>
+      </activation>
+      <build>
+        <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-plugin-plugin</artifactId>
+            <configuration>
+              <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
+              <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+            </configuration>
             <executions>
-              <!-- FIXME: Disable execution, makes IT preparation using maven-plugin-testing-tools fail (see target/test-build-logs/setup.build.log) -->
               <execution>
-                <id>generated-helpmojo</id>
-                <configuration>
-                  <extractors>
-                    <extractor/>
-                  </extractors>
-                </configuration>
+                <id>mojo-descriptor</id>
+                <goals><!-- Maven 2 does not support phase overriding: need to add an execution -->
+                  <goal>descriptor</goal>
+                </goals>
               </execution>
             </executions>
           </plugin>
         </plugins>
       </build>
-    </profile>
+    </profile>    
   </profiles>
 
   <reporting>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugin-plugin</artifactId>
+        <version>${mavenPluginToolsVersion}</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
         <version>${surefire.version}</version>
         <reportSets>