From 14a571a3f280822ad67820f0f98897b73de6cf0e Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Fri, 6 Jul 2018 17:59:56 +0200
Subject: [PATCH 1/6] [BAEL-1835] Creating empty Maven Java project with
 compiler plugin

---
 maven-java-kotlin/pom.xml | 31 +++++++++++++++++++++++++++++++
 pom.xml                   |  5 +++--
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 maven-java-kotlin/pom.xml

diff --git a/maven-java-kotlin/pom.xml b/maven-java-kotlin/pom.xml
new file mode 100644
index 0000000000..c77afa4320
--- /dev/null
+++ b/maven-java-kotlin/pom.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+	<artifactId>parent-modules</artifactId>
+	<groupId>com.baeldung</groupId>
+	<version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>maven-java-kotlin</artifactId>
+
+  <properties>
+	<java.version>1.8</java.version>
+  </properties>
+
+  <build>
+	<plugins>
+	  <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-compiler-plugin</artifactId>
+		<version>3.1</version>
+		<configuration>
+		  <source>${java.version}</source>
+		  <target>${java.version}</target>
+		</configuration>
+	  </plugin>
+	</plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 51a762a888..f875400fc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
         <module>spring-boot-persistence</module>
         <module>spring-boot-security</module>
         <module>spring-boot-mvc</module>
-        <module>spring-boot-logging-log4j2</module>	    
+        <module>spring-boot-logging-log4j2</module>
         <module>spring-cloud-data-flow</module>
         <module>spring-cloud</module>
         <module>spring-core</module>
@@ -271,7 +271,8 @@
         <module>java-ee-8-security-api</module>
         <module>spring-webflux-amqp</module>
         <module>antlr</module>
-	      <module>maven-archetype</module>
+        <module>maven-archetype</module>
+        <module>maven-java-kotlin</module>
     </modules>
 
     <dependencies>

From 3a9ca3b8d948c465ef53e157e1efc6cc3b2d3a95 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Fri, 6 Jul 2018 18:21:53 +0200
Subject: [PATCH 2/6] [BAEL-1835] Adding dummy application and Java service

---
 .../baeldung/mavenjavakotlin/Application.java | 21 +++++++++++++++++++
 .../mavenjavakotlin/services/JavaService.java |  9 ++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
 create mode 100644 maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java

diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
new file mode 100644
index 0000000000..83daf55df7
--- /dev/null
+++ b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
@@ -0,0 +1,21 @@
+package com.baeldung.mavenjavakotlin;
+
+import com.baeldung.mavenjavakotlin.services.JavaService;
+
+public class Application {
+
+  private static final String JAVA = "java";
+
+  public static void main(String[] args) {
+    String language = args[0];
+    switch (language) {
+      case JAVA:
+        new JavaService().sayHello();
+        break;
+      default:
+        // Do nothing
+        break;
+    }
+  }
+
+}
diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
new file mode 100644
index 0000000000..6dad31b3a0
--- /dev/null
+++ b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
@@ -0,0 +1,9 @@
+package com.baeldung.mavenjavakotlin.services;
+
+public class JavaService {
+
+  public void sayHello() {
+    System.out.println("Java says 'Hello!'");
+  }
+
+}

From 0810f9f7e221a89c6b2e109f6a5e06dc6761577e Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Fri, 6 Jul 2018 18:24:36 +0200
Subject: [PATCH 3/6] [BAEL-1835] Added packaging jar to pom

---
 maven-java-kotlin/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maven-java-kotlin/pom.xml b/maven-java-kotlin/pom.xml
index c77afa4320..beef017b5b 100644
--- a/maven-java-kotlin/pom.xml
+++ b/maven-java-kotlin/pom.xml
@@ -10,6 +10,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>maven-java-kotlin</artifactId>
+  <packaging>jar</packaging>
 
   <properties>
 	<java.version>1.8</java.version>

From 2059cb13a45fe52b6512ca73bc4bcc2e40a4fa07 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Fri, 6 Jul 2018 23:03:50 +0200
Subject: [PATCH 4/6] [BAEL-1835] Updated pom to handle Kotlin and Java sources
 compiling

---
 maven-java-kotlin/pom.xml | 98 ++++++++++++++++++++++++++++++++-------
 1 file changed, 81 insertions(+), 17 deletions(-)

diff --git a/maven-java-kotlin/pom.xml b/maven-java-kotlin/pom.xml
index beef017b5b..0f50cd1cc9 100644
--- a/maven-java-kotlin/pom.xml
+++ b/maven-java-kotlin/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-	<artifactId>parent-modules</artifactId>
-	<groupId>com.baeldung</groupId>
-	<version>1.0.0-SNAPSHOT</version>
+    <artifactId>parent-modules</artifactId>
+    <groupId>com.baeldung</groupId>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -13,20 +13,84 @@
   <packaging>jar</packaging>
 
   <properties>
-	<java.version>1.8</java.version>
+    <java.version>1.8</java.version>
+    <kotlin.version>1.2.51</kotlin.version>
   </properties>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
-	<plugins>
-	  <plugin>
-		<groupId>org.apache.maven.plugins</groupId>
-		<artifactId>maven-compiler-plugin</artifactId>
-		<version>3.1</version>
-		<configuration>
-		  <source>${java.version}</source>
-		  <target>${java.version}</target>
-		</configuration>
-	  </plugin>
-	</plugins>
+    <plugins>
+      <plugin>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <version>${kotlin.version}</version>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                <sourceDir>${project.basedir}/src/main/java</sourceDir>
+              </sourceDirs>
+            </configuration>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <goals>
+              <goal>test-compile</goal>
+            </goals>
+            <configuration>
+              <sourceDirs>
+                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                <sourceDir>${project.basedir}/src/test/java</sourceDir>
+              </sourceDirs>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+  <plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-compiler-plugin</artifactId>
+    <version>3.1</version>
+    <configuration>
+      <source>${java.version}</source>
+      <target>${java.version}</target>
+    </configuration>
+    <executions>
+      <execution>
+        <id>default-compile</id>
+        <phase>none</phase>
+      </execution>
+      <execution>
+        <id>default-testCompile</id>
+        <phase>none</phase>
+      </execution>
+      <execution>
+        <id>java-compile</id>
+        <phase>compile</phase>
+        <goals>
+          <goal>compile</goal>
+        </goals>
+      </execution>
+      <execution>
+        <id>java-test-compile</id>
+        <phase>test-compile</phase>
+        <goals>
+          <goal>testCompile</goal>
+        </goals>
+      </execution>
+    </executions>
+  </plugin>
+    </plugins>
   </build>
 </project>
\ No newline at end of file

From b9e6222ced2ea38deeda9f5e185257047b79ea1f Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sat, 7 Jul 2018 09:50:51 +0200
Subject: [PATCH 5/6] [BAEL-1835] Added dummy KotlinService

---
 .../java/com/baeldung/mavenjavakotlin/Application.java   | 4 ++++
 .../baeldung/mavenjavakotlin/services/JavaService.java   | 2 +-
 .../kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt | 9 +++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt

diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
index 83daf55df7..2a948d08ed 100644
--- a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
+++ b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
@@ -5,6 +5,7 @@ import com.baeldung.mavenjavakotlin.services.JavaService;
 public class Application {
 
   private static final String JAVA = "java";
+  private static final String KOTLIN = "kotlin";
 
   public static void main(String[] args) {
     String language = args[0];
@@ -12,6 +13,9 @@ public class Application {
       case JAVA:
         new JavaService().sayHello();
         break;
+      case KOTLIN:
+        new KotlinService().sayHello();
+        break;
       default:
         // Do nothing
         break;
diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
index 6dad31b3a0..cfe69b04bb 100644
--- a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
+++ b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
@@ -3,7 +3,7 @@ package com.baeldung.mavenjavakotlin.services;
 public class JavaService {
 
   public void sayHello() {
-    System.out.println("Java says 'Hello!'");
+    System.out.println("Java says 'Hello World!'");
   }
 
 }
diff --git a/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt b/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
new file mode 100644
index 0000000000..b4c7acf96d
--- /dev/null
+++ b/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
@@ -0,0 +1,9 @@
+package com.baeldung.mavenjavakotlin
+
+class KotlinService {
+
+  fun sayHello() {
+    System.out.println("Kotlin says 'Hello World!'")
+  }
+
+}
\ No newline at end of file

From 60702c111cbc708e72513e573ce545c78c689986 Mon Sep 17 00:00:00 2001
From: dupirefr <dupire.francois+pro@gmail.com>
Date: Sat, 7 Jul 2018 10:27:28 +0200
Subject: [PATCH 6/6] [BAEL-1835] Fixing indent and organization

---
 maven-java-kotlin/pom.xml                     | 174 +++++++++---------
 .../baeldung/mavenjavakotlin/Application.java |  31 ++--
 .../mavenjavakotlin/services/JavaService.java |   6 +-
 .../baeldung/mavenjavakotlin/KotlinService.kt |   9 -
 .../mavenjavakotlin/services/KotlinService.kt |   9 +
 5 files changed, 115 insertions(+), 114 deletions(-)
 delete mode 100644 maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
 create mode 100644 maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt

diff --git a/maven-java-kotlin/pom.xml b/maven-java-kotlin/pom.xml
index 0f50cd1cc9..c4011ec884 100644
--- a/maven-java-kotlin/pom.xml
+++ b/maven-java-kotlin/pom.xml
@@ -2,95 +2,95 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>parent-modules</artifactId>
-    <groupId>com.baeldung</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>maven-java-kotlin</artifactId>
-  <packaging>jar</packaging>
+    <artifactId>maven-java-kotlin</artifactId>
+    <packaging>jar</packaging>
 
-  <properties>
-    <java.version>1.8</java.version>
-    <kotlin.version>1.2.51</kotlin.version>
-  </properties>
+    <properties>
+        <java.version>1.8</java.version>
+        <kotlin.version>1.2.51</kotlin.version>
+    </properties>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <version>${kotlin.version}</version>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <version>${kotlin.version}</version>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-                <sourceDir>${project.basedir}/src/main/java</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-                <sourceDir>${project.basedir}/src/test/java</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-  <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-compiler-plugin</artifactId>
-    <version>3.1</version>
-    <configuration>
-      <source>${java.version}</source>
-      <target>${java.version}</target>
-    </configuration>
-    <executions>
-      <execution>
-        <id>default-compile</id>
-        <phase>none</phase>
-      </execution>
-      <execution>
-        <id>default-testCompile</id>
-        <phase>none</phase>
-      </execution>
-      <execution>
-        <id>java-compile</id>
-        <phase>compile</phase>
-        <goals>
-          <goal>compile</goal>
-        </goals>
-      </execution>
-      <execution>
-        <id>java-test-compile</id>
-        <phase>test-compile</phase>
-        <goals>
-          <goal>testCompile</goal>
-        </goals>
-      </execution>
-    </executions>
-  </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
+                                <sourceDir>${project.basedir}/src/main/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
+                                <sourceDir>${project.basedir}/src/test/java</sourceDir>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>java-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>java-test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
index 2a948d08ed..e2cc0f1e01 100644
--- a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
+++ b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/Application.java
@@ -1,25 +1,26 @@
 package com.baeldung.mavenjavakotlin;
 
 import com.baeldung.mavenjavakotlin.services.JavaService;
+import com.baeldung.mavenjavakotlin.services.KotlinService;
 
 public class Application {
 
-  private static final String JAVA = "java";
-  private static final String KOTLIN = "kotlin";
+    private static final String JAVA = "java";
+    private static final String KOTLIN = "kotlin";
 
-  public static void main(String[] args) {
-    String language = args[0];
-    switch (language) {
-      case JAVA:
-        new JavaService().sayHello();
-        break;
-      case KOTLIN:
-        new KotlinService().sayHello();
-        break;
-      default:
-        // Do nothing
-        break;
+    public static void main(String[] args) {
+        String language = args[0];
+        switch (language) {
+            case JAVA:
+                new JavaService().sayHello();
+                break;
+            case KOTLIN:
+                new KotlinService().sayHello();
+                break;
+            default:
+                // Do nothing
+                break;
+        }
     }
-  }
 
 }
diff --git a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
index cfe69b04bb..b767e761af 100644
--- a/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
+++ b/maven-java-kotlin/src/main/java/com/baeldung/mavenjavakotlin/services/JavaService.java
@@ -2,8 +2,8 @@ package com.baeldung.mavenjavakotlin.services;
 
 public class JavaService {
 
-  public void sayHello() {
-    System.out.println("Java says 'Hello World!'");
-  }
+    public void sayHello() {
+        System.out.println("Java says 'Hello World!'");
+    }
 
 }
diff --git a/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt b/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
deleted file mode 100644
index b4c7acf96d..0000000000
--- a/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/KotlinService.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.baeldung.mavenjavakotlin
-
-class KotlinService {
-
-  fun sayHello() {
-    System.out.println("Kotlin says 'Hello World!'")
-  }
-
-}
\ No newline at end of file
diff --git a/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt b/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt
new file mode 100644
index 0000000000..114b1c88df
--- /dev/null
+++ b/maven-java-kotlin/src/main/kotlin/com/baeldung/mavenjavakotlin/services/KotlinService.kt
@@ -0,0 +1,9 @@
+package com.baeldung.mavenjavakotlin.services
+
+class KotlinService {
+
+    fun sayHello() {
+        System.out.println("Kotlin says 'Hello World!'")
+    }
+
+}
\ No newline at end of file