GH-1180 inject project file name (#1183)
This commit is contained in:
@@ -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 "
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
<version>0.1</version>
|
||||
|
||||
<build>
|
||||
<finalName>${project.name}</finalName>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
|
||||
Reference in New Issue
Block a user