Migrate to JSR330 annotations

Author: tbroyer

pom.xml

@@ -93,6 +93,11 @@
       <version>3.12.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
     <dependency>
       <groupId>org.sonatype.plexus</groupId>
       <artifactId>plexus-build-api</artifactId>
@@ -246,6 +251,20 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+        <version>0.9.0.M3</version>
+        <executions>
+          <execution>
+            <id>index-project</id>
+            <goals>
+              <goal>main-index</goal>
+              <goal>test-index</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>

src/main/java/net/ltgt/gwt/maven/AbstractDevModeMojo.java

@@ -11,6 +11,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -19,7 +21,6 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.toolchain.ToolchainManager;
@@ -121,7 +122,7 @@ public abstract class AbstractDevModeMojo extends AbstractMojo {
   @Parameter(defaultValue = "${session}", readonly = true, required = true)
   protected MavenSession session;
 
-  @Component
+  @Inject
   protected ToolchainManager toolchainManager;
 
 

src/main/java/net/ltgt/gwt/maven/CompileMojo.java

@@ -8,13 +8,14 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-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;
@@ -31,7 +32,6 @@
  * Invokes the GWT Compiler on the project's sources and resources.
  */
 @Mojo(name = "compile", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
-@SuppressWarnings("serial")
 public class CompileMojo extends AbstractMojo implements GwtOptions {
 
   /**
@@ -177,7 +177,7 @@ public class CompileMojo extends AbstractMojo implements GwtOptions {
   @Parameter(defaultValue = "${session}", readonly = true, required = true)
   protected MavenSession session;
 
-  @Component
+  @Inject
   protected ToolchainManager toolchainManager;
 
   public void execute() throws MojoExecutionException {

src/main/java/net/ltgt/gwt/maven/GenerateModuleMetadataMojo.java

@@ -3,10 +3,11 @@
 import java.io.File;
 import java.io.IOException;
 
+import javax.inject.Inject;
+
 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;
@@ -38,7 +39,7 @@ public class GenerateModuleMetadataMojo extends AbstractMojo {
   @Parameter(defaultValue = "false")
   private boolean skipModuleMetadata;
 
-  @Component
+  @Inject
   private BuildContext buildContext;
 
   @Override

src/main/java/net/ltgt/gwt/maven/GenerateModuleMojo.java

@@ -6,19 +6,19 @@
 import java.io.InputStreamReader;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.io.Writer;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 import java.util.Set;
 
+import javax.inject.Inject;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
 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;
@@ -28,7 +28,6 @@
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
@@ -102,7 +101,7 @@ public class GenerateModuleMojo extends AbstractMojo {
   @Parameter(defaultValue = "${project.dependencyArtifacts}", required = true, readonly = true)
   private Set<Artifact> dependencyArtifacts;
 
-  @Component
+  @Inject
   private BuildContext buildContext;
 
   @Parameter(defaultValue = "${project}", required = true, readonly = true)

src/main/java/net/ltgt/gwt/maven/JarMojo.java

@@ -3,19 +3,19 @@
 import java.io.File;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 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.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
-import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 
 /**
@@ -44,7 +44,7 @@ public class JarMojo extends AbstractMojo {
   /**
    * The Jar archiver.
    */
-  @Component(role = Archiver.class, hint = "jar" )
+  @Inject
   private JarArchiver jarArchiver;
 
   /**
@@ -66,7 +66,7 @@ public class JarMojo extends AbstractMojo {
   @Parameter
   private MavenArchiveConfiguration archive = new MavenArchiveConfiguration();
 
-  @Component
+  @Inject
   private MavenProjectHelper projectHelper;
 
   /**

src/main/java/net/ltgt/gwt/maven/PackageAppMojo.java

@@ -6,16 +6,16 @@
 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.project.MavenProject;
-import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.war.WarArchiver;
 
 import java.io.File;
 
+import javax.inject.Inject;
+
 /**
  * Package the compiled GWT application into a WAR-like archive.
  */
@@ -61,7 +61,7 @@ public class PackageAppMojo extends AbstractMojo {
   @Parameter(defaultValue = "${session}", required = true, readonly = true)
   private MavenSession session;
 
-  @Component(role = Archiver.class, hint = "war")
+  @Inject
   private WarArchiver warArchiver;
 
   @Override