Merge pull request #878 from sundarraj4u

* pr/878:
  Upgrade to GMavenPlus 1.6.3
This commit is contained in:
Stephane Nicoll 2019-03-27 07:55:02 +01:00
commit 18dbc4dada
5 changed files with 15 additions and 14 deletions

View File

@ -30,11 +30,12 @@ class GroovyMavenBuildCustomizer implements BuildCustomizer<MavenBuild> {
@Override
public void customize(MavenBuild build) {
MavenPlugin groovyMavenPlugin = build.plugin("org.codehaus.gmavenplus",
"gmavenplus-plugin", "1.5");
"gmavenplus-plugin", "1.6.3");
groovyMavenPlugin.execution(null,
(execution) -> execution.goal("addSources").goal("addTestSources")
.goal("generateStubs").goal("compile").goal("testGenerateStubs")
.goal("testCompile").goal("removeStubs").goal("removeTestStubs"));
.goal("generateStubs").goal("compile").goal("generateTestStubs")
.goal("compileTests").goal("removeStubs")
.goal("removeTestStubs"));
}

View File

@ -39,14 +39,14 @@ class GroovyMavenBuildCustomizerTests {
MavenPlugin groovyPlugin = build.getPlugins().get(0);
assertThat(groovyPlugin.getGroupId()).isEqualTo("org.codehaus.gmavenplus");
assertThat(groovyPlugin.getArtifactId()).isEqualTo("gmavenplus-plugin");
assertThat(groovyPlugin.getVersion()).isEqualTo("1.5");
assertThat(groovyPlugin.getVersion()).isEqualTo("1.6.3");
Configuration configuration = groovyPlugin.getConfiguration();
assertThat(configuration).isNull();
assertThat(groovyPlugin.getExecutions()).hasSize(1);
Execution execution = groovyPlugin.getExecutions().get(0);
assertThat(execution.getId()).isNull();
assertThat(execution.getGoals()).containsExactly("addSources", "addTestSources",
"generateStubs", "compile", "testGenerateStubs", "testCompile",
"generateStubs", "compile", "generateTestStubs", "compileTests",
"removeStubs", "removeTestStubs");
assertThat(execution.getPhase()).isNull();
assertThat(execution.getConfiguration()).isNull();

View File

@ -44,7 +44,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.5</version>
<version>1.6.3</version>
<executions>
<execution>
<goals>
@ -52,8 +52,8 @@
<goal>addTestSources</goal>
<goal>generateStubs</goal>
<goal>compile</goal>
<goal>testGenerateStubs</goal>
<goal>testCompile</goal>
<goal>generateTestStubs</goal>
<goal>compileTests</goal>
<goal>removeStubs</goal>
<goal>removeTestStubs</goal>
</goals>

View File

@ -44,7 +44,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.5</version>
<version>1.6.3</version>
<executions>
<execution>
<goals>
@ -52,8 +52,8 @@
<goal>addTestSources</goal>
<goal>generateStubs</goal>
<goal>compile</goal>
<goal>testGenerateStubs</goal>
<goal>testCompile</goal>
<goal>generateTestStubs</goal>
<goal>compileTests</goal>
<goal>removeStubs</goal>
<goal>removeTestStubs</goal>
</goals>

View File

@ -50,7 +50,7 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
<version>1.5</version>
<version>1.6.3</version>
<executions>
<execution>
<goals>
@ -58,8 +58,8 @@
<goal>addTestSources</goal>
<goal>generateStubs</goal>
<goal>compile</goal>
<goal>testGenerateStubs</goal>
<goal>testCompile</goal>
<goal>generateTestStubs</goal>
<goal>compileTests</goal>
<goal>removeStubs</goal>
<goal>removeTestStubs</goal>
</goals>