Map project version from version capability

Closes gh-832
This commit is contained in:
Stephane Nicoll
2019-02-14 14:52:07 +01:00
parent 24887e1ab3
commit 701f3f6277
11 changed files with 56 additions and 36 deletions

View File

@@ -66,6 +66,8 @@ public class ProjectRequestToDescriptionConverter {
description.setPackageName(getPackageName(request, metadata));
description.setPackaging(Packaging.forId(request.getPackaging()));
description.setPlatformVersion(Version.parse(springBootVersion));
description.setVersion(determineValue(request.getVersion(),
() -> metadata.getVersion().getContent()));
resolvedDependencies
.forEach((dependency) -> description.addDependency(dependency.getId(),
MetadataBuildItemMapper.toDependency(dependency)));

View File

@@ -143,6 +143,22 @@ public class ProjectRequestToDescriptionConverterTests {
assertThat(description.getArtifactId()).isEqualTo("foo");
}
@Test
void convertShouldSetVersionFromRequest() {
ProjectRequest request = createProjectRequest();
request.setVersion("1.0.2-SNAPSHOT");
ProjectDescription description = this.converter.convert(request, this.metadata);
assertThat(description.getVersion()).isEqualTo("1.0.2-SNAPSHOT");
}
@Test
void convertShouldUseDefaultFromMetadataOnEmptyVersion() {
ProjectRequest request = createProjectRequest();
request.setVersion(" ");
ProjectDescription description = this.converter.convert(request, this.metadata);
assertThat(description.getVersion()).isEqualTo("0.0.1-SNAPSHOT");
}
@Test
void convertShouldSetBaseDirectoryFromRequest() {
ProjectRequest request = createProjectRequest();