[MPLUGIN-287] refactoring: consistent package name for extractor and javadoc

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1648914 13f79535-47bb-0310-9956-ffa450edef68

maven-plugin-plugin/src/it/annotation-with-inheritance-from-deps/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java

@@ -26,7 +26,7 @@ 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;
-import org.apache.maven.tools.plugin.annotations.FooMojo;
+import org.apache.maven.tools.plugin.extractor.annotations.FooMojo;
 import org.apache.maven.project.MavenProjectHelper;
 
 /**

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/JavaAnnotationsMojoDescriptorExtractor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.tools.plugin.extractor.annotations;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -49,15 +49,15 @@ import org.apache.maven.plugin.descriptor.Requirement;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
 import org.apache.maven.tools.plugin.PluginToolsRequest;
-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;
-import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotatedClass;
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScannerRequest;
 import org.apache.maven.tools.plugin.extractor.ExtractionException;
 import org.apache.maven.tools.plugin.extractor.MojoDescriptorExtractor;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ExecuteAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.MojoAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotatedClass;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScannerRequest;
 import org.apache.maven.tools.plugin.util.PluginUtils;
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/AnnotatedContent.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.datamodel;
+package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/AnnotatedField.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.datamodel;
+package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/ComponentAnnotationContent.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.datamodel;
+package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/ExecuteAnnotationContent.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.datamodel;
+package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/MojoAnnotationContent.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.datamodel;
+package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/datamodel/ParameterAnnotationContent.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.datamodel;
+package org.apache.maven.tools.plugin.extractor.annotations.datamodel;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.scanner;
+package org.apache.maven.tools.plugin.extractor.annotations.scanner;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,14 +24,14 @@ 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;
-import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
-import org.apache.maven.tools.plugin.annotations.scanner.visitors.MojoAnnotationVisitor;
-import org.apache.maven.tools.plugin.annotations.scanner.visitors.MojoClassVisitor;
-import org.apache.maven.tools.plugin.annotations.scanner.visitors.MojoFieldVisitor;
 import org.apache.maven.tools.plugin.extractor.ExtractionException;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ExecuteAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.MojoAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoAnnotationVisitor;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoClassVisitor;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors.MojoFieldVisitor;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.IOUtil;

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/MojoAnnotatedClass.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.scanner;
+package org.apache.maven.tools.plugin.extractor.annotations.scanner;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -20,10 +20,10 @@ package org.apache.maven.tools.plugin.annotations.scanner;
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
-import org.apache.maven.tools.plugin.annotations.datamodel.ExecuteAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ExecuteAnnotationContent;
-import org.apache.maven.tools.plugin.annotations.datamodel.MojoAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.MojoAnnotationContent;
-import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
 
 import java.util.HashMap;
 import java.util.Map;

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/MojoAnnotationsScanner.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.scanner;
+package org.apache.maven.tools.plugin.extractor.annotations.scanner;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/MojoAnnotationsScannerRequest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.scanner;
+package org.apache.maven.tools.plugin.extractor.annotations.scanner;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoAnnotationVisitor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.scanner.visitors;
+package org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.scanner.visitors;
+package org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,8 @@ package org.apache.maven.tools.plugin.annotations.scanner.visitors;
  * under the License.
  */
 
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotatedClass;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotatedClass;
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
 import org.objectweb.asm.AnnotationVisitor;

maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoFieldVisitor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations.scanner.visitors;
+package org.apache.maven.tools.plugin.extractor.annotations.scanner.visitors;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.tools.plugin.annotations.scanner.visitors;
  * under the License.
  */
 
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
 import org.codehaus.plexus.logging.Logger;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Attribute;

maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/FooMojo.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.tools.plugin.extractor.annotations;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/TestAnnotationsReader.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.annotations;
+package org.apache.maven.tools.plugin.extractor.annotations;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,11 +24,11 @@ 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.project.MavenProject;
-import org.apache.maven.tools.plugin.annotations.datamodel.ComponentAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ComponentAnnotationContent;
-import org.apache.maven.tools.plugin.annotations.datamodel.ParameterAnnotationContent;
+import org.apache.maven.tools.plugin.extractor.annotations.datamodel.ParameterAnnotationContent;
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotatedClass;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotatedClass;
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScanner;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScanner;
-import org.apache.maven.tools.plugin.annotations.scanner.MojoAnnotationsScannerRequest;
+import org.apache.maven.tools.plugin.extractor.annotations.scanner.MojoAnnotationsScannerRequest;
 import org.codehaus.plexus.PlexusTestCase;
 import org.fest.assertions.Assertions;
 

maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaJavadocMojoDescriptorExtractor.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.extractor.java;
+package org.apache.maven.tools.plugin.extractor.javadoc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/javadoc/JavadocMojoAnnotation.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.extractor.java;
+package org.apache.maven.tools.plugin.extractor.javadoc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

maven-plugin-tools-java/src/test/java/org/apache/maven/tools/plugin/extractor/javadoc/JavaMojoDescriptorExtractorTest.java

@@ -1,4 +1,4 @@
-package org.apache.maven.tools.plugin.extractor.java;
+package org.apache.maven.tools.plugin.extractor.javadoc;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,7 @@ import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -33,6 +34,7 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.tools.plugin.DefaultPluginToolsRequest;
 import org.apache.maven.tools.plugin.ExtendedMojoDescriptor;
 import org.apache.maven.tools.plugin.PluginToolsRequest;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavaJavadocMojoDescriptorExtractor;
 import org.apache.maven.tools.plugin.generator.Generator;
 import org.apache.maven.tools.plugin.generator.PluginDescriptorGenerator;
 import org.apache.maven.tools.plugin.util.PluginUtils;
@@ -42,6 +44,7 @@ import org.codehaus.plexus.logging.console.ConsoleLogger;
 import org.codehaus.plexus.util.FileUtils;
 
 import junit.framework.TestCase;
+
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.w3c.dom.Document;

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoAggregatorTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoComponentFieldTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoConfiguratorTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecuteTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoExecutionStrategyTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoGoalTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInheritByDefaultTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoInstantiationStrategyTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoParameterFieldTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoPhaseTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoReadOnlyFieldTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiredFieldTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyCollectionTypeTaglet.java

@@ -20,7 +20,8 @@ package org.apache.maven.tools.plugin.javadoc;
  */
 
 import com.sun.tools.doclets.Taglet;
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import java.util.Map;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDependencyResolutionTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresDirectInvocationTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresOnLineTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresProjectTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoRequiresReportsTypeTaglet.java

@@ -21,7 +21,7 @@ package org.apache.maven.tools.plugin.javadoc;
 
 import java.util.Map;
 
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import com.sun.tools.doclets.Taglet;
 

maven-plugin-tools-javadoc/src/main/java/org/apache/maven/tools/plugin/javadoc/MojoThreadSafeTypeTaglet.java

@@ -20,7 +20,8 @@ package org.apache.maven.tools.plugin.javadoc;
  */
 
 import com.sun.tools.doclets.Taglet;
-import org.apache.maven.tools.plugin.extractor.java.JavadocMojoAnnotation;
+
+import org.apache.maven.tools.plugin.extractor.javadoc.JavadocMojoAnnotation;
 
 import java.util.Map;
 

maven-script/pom.xml

@@ -33,8 +33,11 @@ under the License.
   <description>Maven Script Mojo Support lets developer write Maven plugins/goals with scripting languages instead of compiled Java.</description>
 
   <modules>
+    <module>maven-plugin-tools-ant</module>
     <module>maven-script-ant</module>
+    <module>maven-plugin-tools-beanshell</module>
     <module>maven-script-beanshell</module>
+    <module>maven-plugin-tools-model</module>
   </modules>
 
 

pom.xml

@@ -69,9 +69,6 @@
     <module>maven-plugin-tools-annotations</module>
     <module>maven-plugin-tools-javadoc</module>
     <module>maven-plugin-annotations</module>
-    <module>maven-plugin-tools-ant</module>
-    <module>maven-plugin-tools-beanshell</module>
-    <module>maven-plugin-tools-model</module>
     <module>maven-script</module>
     <module>maven-plugin-plugin</module><!-- keep at end since ITs require every extractors -->
   </modules>
@@ -313,11 +310,11 @@
                 </group>
                 <group>
                   <title>Java Annotations Support: Annotations + Extractor</title>
-                  <packages>org.apache.maven.plugins.annotations:org.apache.maven.tools.plugin.annotations*</packages>
+                  <packages>org.apache.maven.plugins.annotations:org.apache.maven.tools.plugin.extractor.annotations*</packages>
                 </group>
                 <group>
                   <title>Javadoc Support: Javadoc Tags Extractor + Taglets</title>
-                  <packages>org.apache.maven.tools.plugin.extractor.java:org.apache.maven.tools.plugin.javadoc</packages>
+                  <packages>org.apache.maven.tools.plugin.extractor.javadoc:org.apache.maven.tools.plugin.javadoc</packages>
                 </group>
                 <group>
                   <title>Beanshell Support: Extractor + Runtime</title>