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

Stop registering java.version as a VersionProperty

Browse Source
This commit is contained in:
Stephane Nicoll
2018-12-06 14:08:45 +01:00
parent bba9eb7a33
commit 742db270d8
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
initializr-generator/src/main/java/io/spring/initializr/generator/ProjectRequest.java
View File

@@ -30,7 +30,6 @@ import io.spring.initializr.metadata.InitializrMetadata;
import io.spring.initializr.metadata.Repository; import io.spring.initializr.metadata.Repository;
import io.spring.initializr.metadata.Type; import io.spring.initializr.metadata.Type;
import io.spring.initializr.util.Version; import io.spring.initializr.util.Version;
import io.spring.initializr.util.VersionProperty;
import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeanWrapperImpl;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
@@ -239,11 +238,9 @@ public class ProjectRequest extends BasicProjectRequest {
} }
} }
else { else {
this.buildProperties.getVersions().put(VersionProperty.of("java.version"), this.buildProperties.getMaven().put("java.version", this::getJavaVersion);
this::getJavaVersion);
if ("kotlin".equals(getLanguage())) { if ("kotlin".equals(getLanguage())) {
this.buildProperties.getVersions() this.buildProperties.getMaven().put("kotlin.version", kotlinVersion);
.put(VersionProperty.of("kotlin.version"), kotlinVersion);
} }
} }
} }

6
initializr-generator/src/test/java/io/spring/initializr/generator/ProjectRequestResolverTests.java
View File

@@ -24,7 +24,6 @@ import java.util.Map;
import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadata;
import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder; import io.spring.initializr.test.metadata.InitializrMetadataTestBuilder;
import io.spring.initializr.util.VersionProperty;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -39,9 +38,6 @@ import static org.assertj.core.api.Assertions.assertThat;
*/ */
public class ProjectRequestResolverTests { public class ProjectRequestResolverTests {
private static final VersionProperty VERSION_PROPERTY = VersionProperty
.of("java.version");
private InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults() private InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.addDependencyGroup("test", "web", "security", "data-jpa").build(); .addDependencyGroup("test", "web", "security", "data-jpa").build();
@@ -60,7 +56,7 @@ public class ProjectRequestResolverTests {
ProjectRequest request = resolve(createMavenProjectRequest(), ProjectRequest request = resolve(createMavenProjectRequest(),
this.postProcessors); this.postProcessors);
assertThat(request.getJavaVersion()).isEqualTo("1.2"); assertThat(request.getJavaVersion()).isEqualTo("1.2");
assertThat(request.getBuildProperties().getVersions().get(VERSION_PROPERTY).get()) assertThat(request.getBuildProperties().getMaven().get("java.version").get())
.isEqualTo("1.2"); .isEqualTo("1.2");
} }

2
initializr-generator/src/test/resources/project/maven/bom-property-pom.xml.gen
View File

@@ -16,8 +16,8 @@
<description>Demo project for Spring Boot</description> <description>Demo project for Spring Boot</description>
<properties> <properties>
<foo.version>1.3.3</foo.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<foo.version>1.3.3</foo.version>
</properties> </properties>
<dependencies> <dependencies>