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 2015/04/13 04:10:46 UTC
svn commit: r1673085 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
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>