From d84770970d07c6f28b59498fe6667c439f8f06d0 Mon Sep 17 00:00:00 2001
From: Hubert Van De Walle <hubv@protonmail.com>
Date: Wed, 7 Oct 2020 01:53:42 +0200
Subject: [PATCH] Use kotlin bom

---
 src/main/resources/starter/pom/@dependencies.twig     |  1 -
 .../resources/starter/pom/@dependencyManagement.twig  | 11 +++++++++++
 src/main/resources/starter/pom/index.twig             |  4 +++-
 src/test/kotlin/starter/templates/PomTemplateTest.kt  |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/starter/pom/@dependencyManagement.twig

diff --git a/src/main/resources/starter/pom/@dependencies.twig b/src/main/resources/starter/pom/@dependencies.twig
index 12478ef..9f52374 100644
--- a/src/main/resources/starter/pom/@dependencies.twig
+++ b/src/main/resources/starter/pom/@dependencies.twig
@@ -2,7 +2,6 @@
     <dependency>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-stdlib-jdk8</artifactId>
-        <version>${kotlin.version}</version>
     </dependency>
 {% for dep in dependencies %}
     <dependency>
diff --git a/src/main/resources/starter/pom/@dependencyManagement.twig b/src/main/resources/starter/pom/@dependencyManagement.twig
new file mode 100644
index 0000000..53905fc
--- /dev/null
+++ b/src/main/resources/starter/pom/@dependencyManagement.twig
@@ -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>
diff --git a/src/main/resources/starter/pom/index.twig b/src/main/resources/starter/pom/index.twig
index f802f36..e4c546c 100644
--- a/src/main/resources/starter/pom/index.twig
+++ b/src/main/resources/starter/pom/index.twig
@@ -11,7 +11,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <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 -->
         {% for version in versions %}
             <{{version.name}}.version>{{version.value}}</{{version.name}}.version>
@@ -23,6 +23,8 @@
 
     {% include "starter/pom/@repositories" %}
 
+    {% include "starter/pom/@dependencyManagement" %}
+
     {% include "starter/pom/@plugins" %}
 
 </project>
diff --git a/src/test/kotlin/starter/templates/PomTemplateTest.kt b/src/test/kotlin/starter/templates/PomTemplateTest.kt
index 9af02a9..a05eef0 100644
--- a/src/test/kotlin/starter/templates/PomTemplateTest.kt
+++ b/src/test/kotlin/starter/templates/PomTemplateTest.kt
@@ -71,7 +71,7 @@ internal class PomTemplateTest {
                 .filter { it.nodeType == Node.ELEMENT_NODE }
                 .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" }