You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/05/04 12:02:41 UTC
svn commit: r1333844 - in /maven/plugin-tools/branches/MPLUGIN-189: ./
maven-plugin-annotations/ maven-plugin-annotations/src/
maven-plugin-annotations/src/main/ maven-plugin-annotations/src/main/java/
maven-plugin-annotations/src/main/java/org/ maven-...
Author: olamy
Date: Fri May 4 10:02:40 2012
New Revision: 1333844
URL: http://svn.apache.org/viewvc?rev=1333844&view=rev
Log:
move annotations to an other artifacts: users only need annotations and the whole content of the scan tooling
Added:
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/pom.xml (with props)
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java (contents, props changed)
- copied, changed from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Component.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java (contents, props changed)
- copied, changed from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Execute.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java (contents, props changed)
- copied, changed from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/LifecyclePhase.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java (contents, props changed)
- copied, changed from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java (contents, props changed)
- copied, changed from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Parameter.java
Removed:
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Component.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Execute.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/LifecyclePhase.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Parameter.java
Modified:
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-plugin/pom.xml
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/pom.xml
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ExecuteAnnotationContent.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ParameterAnnotationContent.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScanner.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java
maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/TestAnnotationsReader.java
maven/plugin-tools/branches/MPLUGIN-189/pom.xml
Added: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/pom.xml?rev=1333844&view=auto
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/pom.xml (added)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/pom.xml Fri May 4 10:02:40 2012
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>maven-plugin-tools</artifactId>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>maven-plugin-annotations</artifactId>
+
+</project>
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java (from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Component.java)
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java?p2=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java&p1=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Component.java&r1=1333843&r2=1333844&rev=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Component.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java Fri May 4 10:02:40 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.plugins.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java (from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Execute.java)
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java?p2=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java&p1=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Execute.java&r1=1333843&r2=1333844&rev=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Execute.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java Fri May 4 10:02:40 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.plugins.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Execute.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java (from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/LifecyclePhase.java)
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java?p2=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java&p1=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/LifecyclePhase.java&r1=1333843&r2=1333844&rev=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/LifecyclePhase.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java Fri May 4 10:02:40 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.plugins.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/LifecyclePhase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java (from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java)
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java?p2=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java&p1=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java&r1=1333843&r2=1333844&rev=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java Fri May 4 10:02:40 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.plugins.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Mojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java (from r1333843, maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Parameter.java)
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java?p2=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java&p1=maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Parameter.java&r1=1333843&r2=1333844&rev=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Parameter.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java Fri May 4 10:02:40 2012
@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.plugins.annotations;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Parameter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-plugin/pom.xml?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-plugin/pom.xml (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-plugin/pom.xml Fri May 4 10:02:40 2012
@@ -85,6 +85,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-annotations</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-beanshell</artifactId>
<version>${project.version}</version>
</dependency>
@@ -160,6 +165,7 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
@@ -195,6 +201,12 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-tools-annotations</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
<!-- plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/pom.xml?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/pom.xml (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/pom.xml Fri May 4 10:02:40 2012
@@ -48,6 +48,10 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java Fri May 4 10:02:40 2012
@@ -18,7 +18,8 @@ package org.apache.maven.tools.plugin.an
* under the License.
*/
-import org.apache.maven.tools.plugin.annotations.Component;
+
+import org.apache.maven.plugins.annotations.Component;
import java.lang.annotation.Annotation;
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ExecuteAnnotationContent.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ExecuteAnnotationContent.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ExecuteAnnotationContent.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ExecuteAnnotationContent.java Fri May 4 10:02:40 2012
@@ -18,8 +18,8 @@ package org.apache.maven.tools.plugin.an
* under the License.
*/
-import org.apache.maven.tools.plugin.annotations.Execute;
-import org.apache.maven.tools.plugin.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
import java.lang.annotation.Annotation;
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java Fri May 4 10:02:40 2012
@@ -18,8 +18,8 @@ package org.apache.maven.tools.plugin.an
* under the License.
*/
-import org.apache.maven.tools.plugin.annotations.LifecyclePhase;
-import org.apache.maven.tools.plugin.annotations.Mojo;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import java.lang.annotation.Annotation;
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ParameterAnnotationContent.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ParameterAnnotationContent.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ParameterAnnotationContent.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ParameterAnnotationContent.java Fri May 4 10:02:40 2012
@@ -18,7 +18,7 @@ package org.apache.maven.tools.plugin.an
* under the License.
*/
-import org.apache.maven.tools.plugin.annotations.Parameter;
+import org.apache.maven.plugins.annotations.Parameter;
import java.lang.annotation.Annotation;
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java Fri May 4 10:02:40 2012
@@ -18,10 +18,10 @@ package org.apache.maven.tools.plugin.an
* under the License.
*/
-import org.apache.maven.tools.plugin.annotations.Component;
-import org.apache.maven.tools.plugin.annotations.Execute;
-import org.apache.maven.tools.plugin.annotations.Mojo;
-import org.apache.maven.tools.plugin.annotations.Parameter;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ExecuteAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.MojoAnnotationContent;
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScanner.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScanner.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScanner.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/MojoAnnotationsScanner.java Fri May 4 10:02:40 2012
@@ -18,10 +18,10 @@ package org.apache.maven.tools.plugin.an
* under the License.
*/
-import org.apache.maven.tools.plugin.annotations.Component;
-import org.apache.maven.tools.plugin.annotations.Execute;
-import org.apache.maven.tools.plugin.annotations.Mojo;
-import org.apache.maven.tools.plugin.annotations.Parameter;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
import java.util.Arrays;
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java Fri May 4 10:02:40 2012
@@ -21,6 +21,11 @@ package org.apache.maven.tools.plugin.an
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.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/**
* @author Olivier Lamy
Modified: maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/TestAnnotationsReader.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/TestAnnotationsReader.java?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/TestAnnotationsReader.java (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/TestAnnotationsReader.java Fri May 4 10:02:40 2012
@@ -19,6 +19,9 @@ package org.apache.maven.tools.plugin.an
*/
import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotatedClass;
Modified: maven/plugin-tools/branches/MPLUGIN-189/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/branches/MPLUGIN-189/pom.xml?rev=1333844&r1=1333843&r2=1333844&view=diff
==============================================================================
--- maven/plugin-tools/branches/MPLUGIN-189/pom.xml (original)
+++ maven/plugin-tools/branches/MPLUGIN-189/pom.xml Fri May 4 10:02:40 2012
@@ -131,6 +131,7 @@
<module>maven-plugin-tools-model</module>
<module>maven-plugin-tools-javadoc</module>
<module>maven-plugin-tools-annotations</module>
+ <module>maven-plugin-annotations</module>
</modules>
<scm>
@@ -182,6 +183,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-tools-beanshell</artifactId>
<version>${project.version}</version>
</dependency>