Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit 2c2473a

Browse files
committed
JERSEY-633: migrate to new Maven Groovy plugin (1.6).
Change-Id: I68d7d13ea898a51fd614ebde54b1e148cc855c8e
1 parent 6ebe12d commit 2c2473a

File tree

6 files changed

+10
-23
lines changed

6 files changed

+10
-23
lines changed

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,9 @@
120120
</dependency>
121121

122122
<dependency>
123-
<groupId>org.codehaus.gmaven</groupId>
124-
<artifactId>gmaven-mojo-support</artifactId>
125-
<version>1.5</version>
126-
<exclusions>
127-
<exclusion>
128-
<groupId>org.codehaus.groovy</groupId>
129-
<artifactId>groovy-all-minimal</artifactId>
130-
</exclusion>
131-
</exclusions>
123+
<groupId>org.codehaus.gmavenplus</groupId>
124+
<artifactId>gmavenplus-plugin</artifactId>
125+
<version>1.6</version>
132126
</dependency>
133127

134128
<dependency>

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,6 @@ import java.util.regex.Pattern
5757
*/
5858
trait RunnerMojo implements SuperRunnerMojo {
5959

60-
/**
61-
* The Maven project to analyze.
62-
*/
63-
@Parameter(defaultValue = "\${project}", readonly = true, name = "project")
64-
MavenProject project
65-
6660
/**
6761
* The port where the container will listen for requests.
6862
*/

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,16 @@ package org.glassfish.jersey.test.maven.runner.gf4
4343
import org.apache.maven.plugin.MojoExecutionException
4444
import org.apache.maven.plugin.MojoFailureException
4545
import org.apache.maven.plugins.annotations.Parameter
46-
import org.codehaus.gmaven.mojo.GroovyMojo
46+
import org.codehaus.gmavenplus.mojo.AbstractGroovyMojo
4747
import org.glassfish.jersey.test.maven.runner.RunnerMojo
4848

4949
import java.nio.file.Paths
50-
5150
/**
5251
* Abstract class for all Glassfish4 related mojos.
5352
*
5453
* @author Stepan Vavra (stepan.vavra at oracle.com)
5554
*/
56-
abstract class AbstractGlassfishRunnerMojo extends GroovyMojo implements RunnerMojo {
55+
abstract class AbstractGlassfishRunnerMojo extends AbstractGroovyMojo implements RunnerMojo {
5756

5857
/**
5958
* 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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ class RedeployGlassfishMojo extends AbstractGlassfishRunnerMojo implements Commo
5757
redeployAndSendRequest("/runner/gf4/redeploy.sh", "/runner/gf4/stop.sh")
5858
}
5959

60+
6061
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,17 @@ package org.glassfish.jersey.test.maven.runner.tomcat
4343
import org.apache.maven.plugin.MojoExecutionException
4444
import org.apache.maven.plugin.MojoFailureException
4545
import org.apache.maven.plugins.annotations.Parameter
46-
import org.codehaus.gmaven.mojo.GroovyMojo
46+
import org.codehaus.gmavenplus.mojo.AbstractGroovyMojo
4747
import org.glassfish.jersey.test.maven.runner.RunnerMojo
4848

4949
import java.nio.file.Paths
50-
5150
/**
5251
* Abstract class for all Tomcat related mojos.
5352
*
5453
* @author Stepan Vavra (stepan.vavra at oracle.com)
5554
*/
5655

57-
abstract class AbstractTomcatRunnerMojo extends GroovyMojo implements RunnerMojo {
56+
abstract class AbstractTomcatRunnerMojo extends AbstractGroovyMojo implements RunnerMojo {
5857

5958
/**
6059
* {@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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ package org.glassfish.jersey.test.maven.runner.wls
4343
import org.apache.maven.plugin.MojoExecutionException
4444
import org.apache.maven.plugin.MojoFailureException
4545
import org.apache.maven.plugins.annotations.Parameter
46-
import org.codehaus.gmaven.mojo.GroovyMojo
46+
import org.codehaus.gmavenplus.mojo.AbstractGroovyMojo
4747
import org.glassfish.jersey.test.maven.runner.RunnerMojo
4848

4949
import java.nio.file.Paths
@@ -53,7 +53,7 @@ import java.nio.file.Paths
5353
*
5454
* @author Stepan Vavra (stepan.vavra at oracle.com)
5555
*/
56-
abstract class AbstractWlsRunnerMojo extends GroovyMojo implements RunnerMojo {
56+
abstract class AbstractWlsRunnerMojo extends AbstractGroovyMojo implements RunnerMojo {
5757

5858
/**
5959
* The value of {@code MW_HOME} directory

0 commit comments

Comments
 (0)