lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-09-27 14:57:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for configuring a Maven parent relative path

Browse Source 
Closes gh-1296
This commit is contained in:
Stephane Nicoll
2022-01-22 11:20:06 +01:00
parent 5a4e7fac95
commit a961c52450
9 changed files with 99 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -64,7 +64,8 @@ public class DefaultMavenBuildCustomizer implements BuildCustomizer<MavenBuild>
build.properties().property("project.build.sourceEncoding", "UTF-8")
.property("project.reporting.outputEncoding", "UTF-8");
}
build.settings().parent(parentPom.getGroupId(), parentPom.getArtifactId(), parentPom.getVersion());
build.settings().parent(parentPom.getGroupId(), parentPom.getArtifactId(), parentPom.getVersion(),
parentPom.getRelativePath());
}
private boolean hasBom(MavenBuild build, BillOfMaterials bom) {
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizerTests.java
+5 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -76,17 +76,19 @@ class DefaultMavenBuildCustomizerTests {
assertThat(parent.getGroupId()).isEqualTo("org.springframework.boot");
assertThat(parent.getArtifactId()).isEqualTo("spring-boot-starter-parent");
assertThat(parent.getVersion()).isEqualTo("2.0.0");
assertThat(parent.getRelativePath()).isEmpty();
}
@Test
void customizeWithCustomParentAndSpringBootBomShouldAddBom() {
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.setMavenParent("com.foo", "foo-parent", "1.0.0-SNAPSHOT", true).build();
.setMavenParent("com.foo", "foo-parent", "1.0.0-SNAPSHOT", "../pom.xml", true).build();
MavenBuild build = customizeBuild(metadata);
MavenParent parent = build.getSettings().getParent();
assertThat(parent.getGroupId()).isEqualTo("com.foo");
assertThat(parent.getArtifactId()).isEqualTo("foo-parent");
assertThat(parent.getVersion()).isEqualTo("1.0.0-SNAPSHOT");
assertThat(parent.getRelativePath()).isEqualTo("../pom.xml");
BomContainer boms = build.boms();
assertThat(boms.items()).hasSize(1);
assertThat(boms.ids()).contains("spring-boot");
@@ -97,7 +99,7 @@ class DefaultMavenBuildCustomizerTests {
@Test
void customizeWithNoSpringBootBomShouldNotAddBom() {
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.setMavenParent("com.foo", "foo-parent", "1.0.0-SNAPSHOT", false).build();
.setMavenParent("com.foo", "foo-parent", "1.0.0-SNAPSHOT", null, false).build();
MavenBuild build = customizeBuild(metadata);
BomContainer boms = build.boms();
assertThat(boms.items()).hasSize(0);