From 347f0a7a920bca8e87025ce51a6529dfb925a3aa Mon Sep 17 00:00:00 2001
From: Rad <akefirad@users.noreply.github.com>
Date: Fri, 23 Aug 2019 16:08:48 +0200
Subject: [PATCH] GH-1180 inject project file name (#1183)

---
 .../cloud/contract/maven/verifier/GenerateStubsMojo.java    | 6 ++++--
 .../cloud/contract/maven/verifier/PluginUnitTest.java       | 6 +++---
 .../src/test/projects/generatedStubs/pom.xml                | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java
index 1cc82ba869..01f911aab9 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/GenerateStubsMojo.java
@@ -45,6 +45,9 @@ public class GenerateStubsMojo extends AbstractMojo {
 	@Parameter(defaultValue = "${project.build.directory}", readonly = true, required = true)
 	private File projectBuildDirectory;
 
+	@Parameter(defaultValue = "${project.build.finalName}", readonly = true, required = true)
+	private String projectFinalName;
+
 	@Parameter(property = "stubsDirectory", defaultValue = "${project.build.directory}/stubs")
 	private File outputDirectory;
 
@@ -98,8 +101,7 @@ public class GenerateStubsMojo extends AbstractMojo {
 					+ stubsOutputDir.getAbsolutePath()
 					+ "] .\nPlease make sure that spring-cloud-contract:convert was invoked");
 		}
-		String stubArchiveName = this.project.getBuild().getFinalName() + "-"
-				+ this.classifier + ".jar";
+		String stubArchiveName = this.projectFinalName + "-" + this.classifier + ".jar";
 		File stubsJarFile = new File(this.projectBuildDirectory, stubArchiveName);
 		String[] excludes = excludes();
 		getLog().info("Files matching this pattern will be excluded from "
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java
index 270482dc86..846ecfcc0f 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java
@@ -148,7 +148,7 @@ public class PluginUnitTest {
 	public void shouldGenerateStubs() throws Exception {
 		File basedir = this.resources.getBasedir("generatedStubs");
 		this.maven.executeMojo(basedir, "generateStubs", defaultPackageForTests());
-		assertFilesPresent(basedir, "target/sample-project-0.1-stubs.jar");
+		assertFilesPresent(basedir, "target/sample-project-stubs.jar");
 	}
 
 	@Test
@@ -156,7 +156,7 @@ public class PluginUnitTest {
 		File basedir = this.resources.getBasedir("generatedStubs");
 		this.maven.executeMojo(basedir, "generateStubs", defaultPackageForTests(),
 				newParameter("attachContracts", "false"));
-		assertFilesPresent(basedir, "target/sample-project-0.1-stubs.jar");
+		assertFilesPresent(basedir, "target/sample-project-stubs.jar");
 		// FIXME: add assertion for jar content
 	}
 
@@ -165,7 +165,7 @@ public class PluginUnitTest {
 		File basedir = this.resources.getBasedir("generatedStubs");
 		this.maven.executeMojo(basedir, "generateStubs", defaultPackageForTests(),
 				newParameter("classifier", "foo"));
-		assertFilesPresent(basedir, "target/sample-project-0.1-foo.jar");
+		assertFilesPresent(basedir, "target/sample-project-foo.jar");
 	}
 
 	@Test
diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml
index 1b0b426f80..5ba04920fb 100644
--- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml
+++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/generatedStubs/pom.xml
@@ -27,6 +27,7 @@
 	<version>0.1</version>
 
 	<build>
+		<finalName>${project.name}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.cloud</groupId>