Use kotlin bom
This commit is contained in:
parent
fe03d64122
commit
d84770970d
@ -2,7 +2,6 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
||||||
<version>${kotlin.version}</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
{% for dep in dependencies %}
|
{% for dep in dependencies %}
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
11
src/main/resources/starter/pom/@dependencyManagement.twig
Normal file
11
src/main/resources/starter/pom/@dependencyManagement.twig
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<dependencyManagement>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
|
<artifactId>kotlin-bom</artifactId>
|
||||||
|
<version>${kotlin.version}</version>
|
||||||
|
<type>pom</type>
|
||||||
|
<scope>import</scope>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</dependencyManagement>
|
||||||
@ -11,7 +11,7 @@
|
|||||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<main.class>{{ basePackage }}/{{ name | lower | capitalize }}Kt</main.class>
|
<main.class>{{ basePackage }}.{{ name | lower | capitalize }}Kt</main.class>
|
||||||
<!-- versions -->
|
<!-- versions -->
|
||||||
{% for version in versions %}
|
{% for version in versions %}
|
||||||
<{{version.name}}.version>{{version.value}}</{{version.name}}.version>
|
<{{version.name}}.version>{{version.value}}</{{version.name}}.version>
|
||||||
@ -23,6 +23,8 @@
|
|||||||
|
|
||||||
{% include "starter/pom/@repositories" %}
|
{% include "starter/pom/@repositories" %}
|
||||||
|
|
||||||
|
{% include "starter/pom/@dependencyManagement" %}
|
||||||
|
|
||||||
{% include "starter/pom/@plugins" %}
|
{% include "starter/pom/@plugins" %}
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -71,7 +71,7 @@ internal class PomTemplateTest {
|
|||||||
.filter { it.nodeType == Node.ELEMENT_NODE }
|
.filter { it.nodeType == Node.ELEMENT_NODE }
|
||||||
.associate { it.nodeName to it.firstChild.nodeValue }
|
.associate { it.nodeName to it.firstChild.nodeValue }
|
||||||
|
|
||||||
Triple(map["groupId"]!!, map["artifactId"]!!, map["version"]!!)
|
Triple(map["groupId"]!!, map["artifactId"]!!, map["version"] ?: "")
|
||||||
|
|
||||||
}.filterNot { it.second == "kotlin-stdlib-jdk8" }
|
}.filterNot { it.second == "kotlin-stdlib-jdk8" }
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user