lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-19 10:08:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to GMavenPlus 1.6.3

Browse Source 
See gh-878
This commit is contained in:
unknown
2019-03-25 23:31:29 -04:00
committed by Stephane Nicoll
parent b5e1f6c921
commit bfed3d9474
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizer.java
View File

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

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java
View File

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

6
initializr-generator-spring/src/test/resources/project/groovy/previous/pom.xml.gen
View File

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

6
initializr-generator-spring/src/test/resources/project/groovy/standard/pom.xml.gen
View File

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

6
initializr-generator-spring/src/test/resources/project/groovy/standard/war-pom.xml.gen
View File

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