JERSEY-633: migrate to new Maven Groovy plugin (1.6).

Change-Id: I68d7d13ea898a51fd614ebde54b1e148cc855c8e

Author: tomas-langer

test-framework/maven/container-runner-maven-plugin/pom.xml

@@ -120,15 +120,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.gmaven</groupId>
-            <artifactId>gmaven-mojo-support</artifactId>
-            <version>1.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.groovy</groupId>
-                    <artifactId>groovy-all-minimal</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.codehaus.gmavenplus</groupId>
+            <artifactId>gmavenplus-plugin</artifactId>
+            <version>1.6</version>
         </dependency>
 
         <dependency>

test-framework/maven/container-runner-maven-plugin/src/main/groovy/org/glassfish/jersey/test/maven/runner/RunnerMojo.groovy

@@ -57,12 +57,6 @@ import java.util.regex.Pattern
  */
 trait RunnerMojo implements SuperRunnerMojo {
 
-    /**
-     * The Maven project to analyze.
-     */
-    @Parameter(defaultValue = "\${project}", readonly = true, name = "project")
-    MavenProject project
-
     /**
      * The port where the container will listen for requests.
      */

test-framework/maven/container-runner-maven-plugin/src/main/groovy/org/glassfish/jersey/test/maven/runner/gf4/AbstractGlassfishRunnerMojo.groovy

@@ -43,17 +43,16 @@ package org.glassfish.jersey.test.maven.runner.gf4
 import org.apache.maven.plugin.MojoExecutionException
 import org.apache.maven.plugin.MojoFailureException
 import org.apache.maven.plugins.annotations.Parameter
-import org.codehaus.gmaven.mojo.GroovyMojo
+import org.codehaus.gmavenplus.mojo.AbstractGroovyMojo
 import org.glassfish.jersey.test.maven.runner.RunnerMojo
 
 import java.nio.file.Paths
-
 /**
  * Abstract class for all Glassfish4 related mojos.
  *
  * @author Stepan Vavra (stepan.vavra at oracle.com)
  */
-abstract class AbstractGlassfishRunnerMojo extends GroovyMojo implements RunnerMojo {
+abstract class AbstractGlassfishRunnerMojo extends AbstractGroovyMojo implements RunnerMojo {
 
     /**
      * The {@code AS_HOME} environment variable value. If relative directory is specified (which is the default), it is derived

test-framework/maven/container-runner-maven-plugin/src/main/groovy/org/glassfish/jersey/test/maven/runner/gf4/RedeployGlassfishMojo.groovy

@@ -57,4 +57,5 @@ class RedeployGlassfishMojo extends AbstractGlassfishRunnerMojo implements Commo
         redeployAndSendRequest("/runner/gf4/redeploy.sh", "/runner/gf4/stop.sh")
     }
 
+
 }

test-framework/maven/container-runner-maven-plugin/src/main/groovy/org/glassfish/jersey/test/maven/runner/tomcat/AbstractTomcatRunnerMojo.groovy

@@ -43,18 +43,17 @@ package org.glassfish.jersey.test.maven.runner.tomcat
 import org.apache.maven.plugin.MojoExecutionException
 import org.apache.maven.plugin.MojoFailureException
 import org.apache.maven.plugins.annotations.Parameter
-import org.codehaus.gmaven.mojo.GroovyMojo
+import org.codehaus.gmavenplus.mojo.AbstractGroovyMojo
 import org.glassfish.jersey.test.maven.runner.RunnerMojo
 
 import java.nio.file.Paths
-
 /**
  * Abstract class for all Tomcat related mojos.
  *
  * @author Stepan Vavra (stepan.vavra at oracle.com)
  */
 
-abstract class AbstractTomcatRunnerMojo extends GroovyMojo implements RunnerMojo {
+abstract class AbstractTomcatRunnerMojo extends AbstractGroovyMojo implements RunnerMojo {
 
     /**
      * {@code CATALINA_HOME} environmental variable. If relative path specified, then it is appended to

test-framework/maven/container-runner-maven-plugin/src/main/groovy/org/glassfish/jersey/test/maven/runner/wls/AbstractWlsRunnerMojo.groovy

@@ -43,7 +43,7 @@ package org.glassfish.jersey.test.maven.runner.wls
 import org.apache.maven.plugin.MojoExecutionException
 import org.apache.maven.plugin.MojoFailureException
 import org.apache.maven.plugins.annotations.Parameter
-import org.codehaus.gmaven.mojo.GroovyMojo
+import org.codehaus.gmavenplus.mojo.AbstractGroovyMojo
 import org.glassfish.jersey.test.maven.runner.RunnerMojo
 
 import java.nio.file.Paths
@@ -53,7 +53,7 @@ import java.nio.file.Paths
  *
  * @author Stepan Vavra (stepan.vavra at oracle.com)
  */
-abstract class AbstractWlsRunnerMojo extends GroovyMojo implements RunnerMojo {
+abstract class AbstractWlsRunnerMojo extends AbstractGroovyMojo implements RunnerMojo {
 
     /**
      * The value of {@code MW_HOME} directory