Author: tchemit
Date: Tue Jul 10 18:51:11 2012
New Revision: 1359834
URL: http://svn.apache.org/viewvc?rev=1359834&view=rev
Log:
[MTOOLCHAINS-4] use maven-plugin-tools' java 5 annotations
Modified:
maven/plugins/trunk/maven-toolchains-plugin/pom.xml
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Modified: maven/plugins/trunk/maven-toolchains-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/pom.xml?rev=1359834&r1=1359833&r2=1359834&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/pom.xml Tue Jul 10 18:51:11 2012
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>21</version>
+ <version>22</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -65,6 +65,11 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -72,6 +77,34 @@ under the License.
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
<reporting>
<plugins>
<plugin>
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java?rev=1359834&r1=1359833&r2=1359834&view=diff
==============================================================================
---
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
(original)
+++
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
Tue Jul 10 18:51:11 2012
@@ -19,51 +19,48 @@ package org.apache.maven.plugin.toolchai
* under the License.
*/
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.toolchain.MisconfiguredToolchainException;
import org.apache.maven.toolchain.ToolchainManagerPrivate;
import org.apache.maven.toolchain.ToolchainPrivate;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
- * @goal toolchain
- * @phase validate
- * @configurator override
- *
* @author mkleint
*/
+@Mojo( name = "toolchain", defaultPhase = LifecyclePhase.VALIDATE )
public class ToolchainMojo
extends AbstractMojo
{
/**
- *
- * @component
*/
+ @Component
private ToolchainManagerPrivate toolchainManager;
/**
* The current build session instance. This is used for
* toolchain manager API calls.
- *
- * @parameter expression="${session}"
- * @required
- * @readonly
*/
+ @Component
private MavenSession session;
/**
- * @parameter
- * @required
*/
+ @Parameter( required = true )
private Toolchains toolchains;
public ToolchainMojo()
