ensure that the hawtio goals are invoked after test-compile is invoked

hawtio · Dec 5, 2013 · 383e935 · 383e935
1 parent c8c4905
commit 383e935
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/hawtio-maven-plugin/src/main/java/io/hawt/maven/CamelBlueprintMojo.java b/hawtio-maven-plugin/src/main/java/io/hawt/maven/CamelBlueprintMojo.java
@@ -5,12 +5,14 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
+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.plugins.annotations.ResolutionScope;
 
-@Mojo(name = "camel-blueprint", defaultPhase = LifecyclePhase.TEST_COMPILE, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Mojo(name = "camel-blueprint", defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Execute(phase = LifecyclePhase.PROCESS_TEST_CLASSES)
 public class CamelBlueprintMojo extends RunMojo {
 
     @Parameter(property = "hawtio.applicationContext")

diff --git a/hawtio-maven-plugin/src/main/java/io/hawt/maven/CamelMojo.java b/hawtio-maven-plugin/src/main/java/io/hawt/maven/CamelMojo.java
@@ -5,12 +5,14 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
+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.plugins.annotations.ResolutionScope;
 
-@Mojo(name = "camel", defaultPhase = LifecyclePhase.TEST_COMPILE, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Mojo(name = "camel", defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Execute(phase = LifecyclePhase.PROCESS_TEST_CLASSES)
 public class CamelMojo extends RunMojo {
 
     @Parameter(property = "hawtio.applicationContextUri")

diff --git a/hawtio-maven-plugin/src/main/java/io/hawt/maven/RunMojo.java b/hawtio-maven-plugin/src/main/java/io/hawt/maven/RunMojo.java
@@ -11,12 +11,14 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+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.plugins.annotations.ResolutionScope;
 
-@Mojo(name = "run", defaultPhase = LifecyclePhase.TEST_COMPILE, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Mojo(name = "run", defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Execute(phase = LifecyclePhase.PROCESS_TEST_CLASSES)
 public class RunMojo extends BaseMojo {
 
     @Parameter(property = "hawtio.port", defaultValue = "8080")

diff --git a/hawtio-maven-plugin/src/main/java/io/hawt/maven/SpringMojo.java b/hawtio-maven-plugin/src/main/java/io/hawt/maven/SpringMojo.java
@@ -5,12 +5,14 @@
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
+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.plugins.annotations.ResolutionScope;
 
-@Mojo(name = "spring", defaultPhase = LifecyclePhase.TEST_COMPILE, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Mojo(name = "spring", defaultPhase = LifecyclePhase.PROCESS_TEST_CLASSES, requiresDependencyResolution = ResolutionScope.RUNTIME)
+@Execute(phase = LifecyclePhase.PROCESS_TEST_CLASSES)
 public class SpringMojo extends RunMojo {
 
     @Parameter(property = "hawtio.applicationContextUri")

diff --git a/hawtio-maven-plugin/src/main/java/io/hawt/maven/TestMojo.java b/hawtio-maven-plugin/src/main/java/io/hawt/maven/TestMojo.java
@@ -27,12 +27,14 @@
 import io.hawt.maven.junit.DefaultJUnitService;
 import io.hawt.maven.junit.JUnitService;
 import io.hawt.maven.util.ReflectionHelper;
+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.plugins.annotations.ResolutionScope;
 
-@Mojo(name = "test", defaultPhase = LifecyclePhase.TEST_COMPILE, requiresDependencyResolution = ResolutionScope.TEST)
+@Mojo(name = "test", defaultPhase = LifecyclePhase.INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.TEST)
+@Execute(phase = LifecyclePhase.PROCESS_TEST_CLASSES)
 public class TestMojo extends CamelMojo {
 
     @Parameter(property = "hawtio.className", required = true)