From bfed3d94743686659256393e25f155322c2faf86 Mon Sep 17 00:00:00 2001
From: unknown <8205803+sundarraj4u@users.noreply.github.com>
Date: Mon, 25 Mar 2019 23:31:29 -0400
Subject: [PATCH] Upgrade to GMavenPlus 1.6.3

See gh-878
---
 .../spring/code/groovy/GroovyMavenBuildCustomizer.java     | 7 ++++---
 .../code/groovy/GroovyMavenBuildCustomizerTests.java       | 4 ++--
 .../src/test/resources/project/groovy/previous/pom.xml.gen | 6 +++---
 .../src/test/resources/project/groovy/standard/pom.xml.gen | 6 +++---
 .../test/resources/project/groovy/standard/war-pom.xml.gen | 6 +++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizer.java
index 8d16f526..8b87e9a8 100644
--- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizer.java
+++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizer.java
@@ -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"));
 
 	}
 
diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java
index e5262dba..24060422 100644
--- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java
+++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/groovy/GroovyMavenBuildCustomizerTests.java
@@ -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();
diff --git a/initializr-generator-spring/src/test/resources/project/groovy/previous/pom.xml.gen b/initializr-generator-spring/src/test/resources/project/groovy/previous/pom.xml.gen
index 97819fd3..aa41f63d 100644
--- a/initializr-generator-spring/src/test/resources/project/groovy/previous/pom.xml.gen
+++ b/initializr-generator-spring/src/test/resources/project/groovy/previous/pom.xml.gen
@@ -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>
diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/pom.xml.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/pom.xml.gen
index 16035658..30745fb1 100644
--- a/initializr-generator-spring/src/test/resources/project/groovy/standard/pom.xml.gen
+++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/pom.xml.gen
@@ -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>
diff --git a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-pom.xml.gen b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-pom.xml.gen
index 8524b4e7..6da16aaa 100644
--- a/initializr-generator-spring/src/test/resources/project/groovy/standard/war-pom.xml.gen
+++ b/initializr-generator-spring/src/test/resources/project/groovy/standard/war-pom.xml.gen
@@ -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>