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

Manage Kotlin version consistently

Browse Source 
Closes gh-564
This commit is contained in:
Stephane Nicoll
2017-12-28 13:42:04 +01:00
parent bfbbb9e6f9
commit 72184131a3
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
View File

@@ -357,10 +357,6 @@ public class ProjectGenerator {
model.put("kotlinSupport", kotlinSupport);
if (isMavenBuild(request)) {
if (kotlinSupport) { // No need to provide a kotlin.version
request.getBuildProperties().getVersions()
.remove(new VersionProperty("kotlin.version"));
}
model.put("mavenBuild", true);
ParentPom parentPom = metadata.getConfiguration().getEnv().getMaven()
.resolveParentPom(request.getBootVersion());

1
initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
View File

@@ -23,6 +23,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>9</java.version>
<kotlin.version>1.1.1</kotlin.version>
</properties>
<dependencies>

1
initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
View File

@@ -23,6 +23,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<kotlin.version>1.1.1</kotlin.version>
</properties>
<dependencies>