Author: olamy
Date: Thu Jul 12 16:30:51 2012
New Revision: 1360770
URL: http://svn.apache.org/viewvc?rev=1360770&view=rev
Log:
move plugin version to a property and plugins annotations in compile scope
Modified:
maven/plugins/trunk/maven-ear-plugin/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/pom.xml?rev=1360770&r1=1360769&r2=1360770&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/pom.xml Thu Jul 12 16:30:51 2012
@@ -56,6 +56,7 @@ under the License.
<mavenArchiverVersion>2.5</mavenArchiverVersion>
<mavenFilteringVersion>1.0-beta-2</mavenFilteringVersion>
<mavenVersion>2.0.6</mavenVersion>
+ <mavenPluginVersion>3.1</mavenPluginVersion>
</properties>
<dependencies>
@@ -87,7 +88,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.1</version>
+ <version>${mavenPluginVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -135,8 +136,9 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.1</version>
+ <version>${mavenPluginVersion}</version>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
</configuration>
@@ -146,6 +148,7 @@ under the License.
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<configuration>
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
@@ -173,10 +176,36 @@ under the License.
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>${mavenPluginVersion}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
<profiles>
<profile>
<id>run-its</id>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <configuration>
+ <!-- NOTE: Must be synced with the repo path used by
AbstractEarPluginIT -->
+
<localRepositoryPath>${project.build.testOutputDirectory}/m2repo</localRepositoryPath>
+ <goals>
+ <goal>clean</goal>
+ <goal>package</goal>
+ </goals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -200,18 +229,6 @@ under the License.
</executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <!-- NOTE: Must be synced with the repo path used by
AbstractEarPluginIT -->
-
<localRepositoryPath>${project.build.testOutputDirectory}/m2repo</localRepositoryPath>
- <goals>
- <goal>clean</goal>
- <goal>package</goal>
- </goals>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>