lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-18 09:44:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move build properties to dedicated container

Browse Source 
See gh-996
This commit is contained in:
Stephane Nicoll
2019-09-03 14:55:04 +02:00
parent 3f6c98173b
commit 59f9092e2f
17 changed files with 181 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java
View File

@@ -77,7 +77,7 @@ public class DependencyManagementBuildCustomizer implements BuildCustomizer<Buil
resolvedBoms.forEach((key, bom) -> {
build.boms().add(key, MetadataBuildItemMapper.toBom(bom));
if (bom.getVersionProperty() != null) {
build.addVersionProperty(bom.getVersionProperty(), bom.getVersion());
build.properties().version(bom.getVersionProperty(), bom.getVersion());
}
});
repositories.keySet().forEach((id) -> build.repositories().add(id));

9
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java
View File

@@ -20,6 +20,7 @@ import io.spring.initializr.generator.buildsystem.BillOfMaterials;
import io.spring.initializr.generator.buildsystem.maven.MavenBuild;
import io.spring.initializr.generator.project.ProjectDescription;
import io.spring.initializr.generator.spring.build.BuildCustomizer;
import io.spring.initializr.generator.version.VersionProperty;
import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven;
import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven.ParentPom;
import io.spring.initializr.metadata.InitializrMetadata;
@@ -44,7 +45,7 @@ public class DefaultMavenBuildCustomizer implements BuildCustomizer<MavenBuild>
@Override
public void customize(MavenBuild build) {
build.settings().name(this.description.getName()).description(this.description.getDescription());
build.setProperty("java.version", this.description.getLanguage().jvmVersion());
build.properties().property("java.version", this.description.getLanguage().jvmVersion());
build.plugins().add("org.springframework.boot", "spring-boot-maven-plugin");
Maven maven = this.metadata.getConfiguration().getEnv().getMaven();
@@ -55,13 +56,13 @@ public class DefaultMavenBuildCustomizer implements BuildCustomizer<MavenBuild>
BillOfMaterials springBootBom = MetadataBuildItemMapper
.toBom(this.metadata.createSpringBootBom(springBootVersion, versionProperty));
if (!hasBom(build, springBootBom)) {
build.addInternalVersionProperty(versionProperty, springBootVersion);
build.properties().version(VersionProperty.of(versionProperty, true), springBootVersion);
build.boms().add("spring-boot", springBootBom);
}
}
if (!maven.isSpringBootStarterParent(parentPom)) {
build.setProperty("project.build.sourceEncoding", "UTF-8");
build.setProperty("project.reporting.outputEncoding", "UTF-8");
build.properties().property("project.build.sourceEncoding", "UTF-8")
.property("project.reporting.outputEncoding", "UTF-8");
}
build.settings().parent(parentPom.getGroupId(), parentPom.getArtifactId(), parentPom.getVersion());
}

2
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenBuildCustomizer.java
View File

@@ -38,7 +38,7 @@ class KotlinMavenBuildCustomizer implements BuildCustomizer<MavenBuild> {
@Override
public void customize(MavenBuild build) {
build.setProperty("kotlin.version", this.settings.getVersion());
build.properties().version("kotlin.version", this.settings.getVersion());
build.settings().sourceDirectory("${project.basedir}/src/main/kotlin")
.testSourceDirectory("${project.basedir}/src/test/kotlin");
build.plugins().add("org.jetbrains.kotlin", "kotlin-maven-plugin", (kotlinMavenPlugin) -> {

2
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenFullBuildCustomizer.java
View File

@@ -35,7 +35,7 @@ class KotlinMavenFullBuildCustomizer implements BuildCustomizer<MavenBuild> {
@Override
public void customize(MavenBuild build) {
build.setProperty("kotlin.version", this.settings.getVersion());
build.properties().version("kotlin.version", this.settings.getVersion());
build.settings().sourceDirectory("${project.basedir}/src/main/kotlin")
.testSourceDirectory("${project.basedir}/src/test/kotlin");
build.plugins().add("org.jetbrains.kotlin", "kotlin-maven-plugin", (kotlinMavenPlugin) -> {

8
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java
View File

@@ -182,11 +182,9 @@ class BuildComplianceTests extends AbstractComplianceTests {
ProjectStructure project = generateProject(java, build, "2.1.1.RELEASE",
(description) -> description.addDependency("web", MetadataBuildItemMapper.toDependency(WEB)),
(projectGenerationContext) -> projectGenerationContext.registerBean(BuildCustomizer.class,
() -> (projectBuild) -> {
projectBuild.addVersionProperty(VersionProperty.of("spring-foo.version", false),
"0.1.0.RELEASE");
projectBuild.addVersionProperty(VersionProperty.of("spring-bar.version"), "0.2.0.RELEASE");
}));
() -> (projectBuild) -> projectBuild.properties()
.version(VersionProperty.of("spring-foo.version", false), "0.1.0.RELEASE")
.version(VersionProperty.of("spring-bar.version"), "0.2.0.RELEASE")));
assertThat(project).textFile(fileName).hasSameContentAs(
new ClassPathResource("project/" + build + "/version-override-" + getAssertFileName(fileName)));
}

5
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizerTests.java
View File

@@ -65,7 +65,7 @@ class DefaultMavenBuildCustomizerTests {
MutableProjectDescription description = initializeDescription();
description.setLanguage(new JavaLanguage("11"));
MavenBuild build = customizeBuild(metadata, description);
assertThat(build.getProperties()).contains(entry("java.version", "11"));
assertThat(build.properties().values()).contains(entry("java.version", "11"));
}
@Test
@@ -90,7 +90,8 @@ class DefaultMavenBuildCustomizerTests {
BomContainer boms = build.boms();
assertThat(boms.items()).hasSize(1);
assertThat(boms.ids()).contains("spring-boot");
assertThat(build.getVersionProperties().get(VersionProperty.of("spring-boot.version"))).isEqualTo("2.0.0");
assertThat(build.properties().versions(VersionProperty::toStandardFormat))
.contains(entry("spring-boot.version", "2.0.0"));
}
@Test

6
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenBuildCustomizerTests.java
View File

@@ -23,9 +23,11 @@ import io.spring.initializr.generator.buildsystem.maven.MavenBuild;
import io.spring.initializr.generator.buildsystem.maven.MavenPlugin.Configuration;
import io.spring.initializr.generator.buildsystem.maven.MavenPlugin.Dependency;
import io.spring.initializr.generator.buildsystem.maven.MavenPlugin.Setting;
import io.spring.initializr.generator.version.VersionProperty;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
/**
* Tests for {@link KotlinMavenBuildCustomizer}.
@@ -38,8 +40,8 @@ class KotlinMavenBuildCustomizerTests {
void kotlinVersionPropertyIsConfigured() {
MavenBuild build = new MavenBuild();
new KotlinMavenBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build);
assertThat(build.getProperties()).hasSize(1);
assertThat(build.getProperties()).containsEntry("kotlin.version", "1.2.70");
assertThat(build.properties().versions(VersionProperty::toStandardFormat))
.containsOnly(entry("kotlin.version", "1.2.70"));
}
@Test

6
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinMavenFullBuildCustomizerTests.java
View File

@@ -21,9 +21,11 @@ import io.spring.initializr.generator.buildsystem.maven.MavenPlugin.Configuratio
import io.spring.initializr.generator.buildsystem.maven.MavenPlugin.Dependency;
import io.spring.initializr.generator.buildsystem.maven.MavenPlugin.Execution;
import io.spring.initializr.generator.buildsystem.maven.MavenPlugin.Setting;
import io.spring.initializr.generator.version.VersionProperty;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
/**
* Tests for {@link KotlinMavenFullBuildCustomizer}.
@@ -36,8 +38,8 @@ class KotlinMavenFullBuildCustomizerTests {
void kotlinVersionPropertyIsConfigured() {
MavenBuild build = new MavenBuild();
new KotlinMavenFullBuildCustomizer(new SimpleKotlinProjectSettings("1.2.70")).customize(build);
assertThat(build.getProperties()).hasSize(1);
assertThat(build.getProperties()).containsEntry("kotlin.version", "1.2.70");
assertThat(build.properties().versions(VersionProperty::toStandardFormat))
.containsOnly(entry("kotlin.version", "1.2.70"));
}
@Test