From 19afd9417726224a4054fbdb7eeec6fd1de459fd Mon Sep 17 00:00:00 2001
From: pivovarit <gpiwowarek@gmail.com>
Date: Sun, 29 Jan 2017 15:29:55 +0100
Subject: [PATCH] Fix kotlin pom.xml

---
 kotlin/pom.xml                                | 66 ++++++++++++-------
 .../kotlin/KotlinScalaInteroperabilityTest.kt |  3 +-
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/kotlin/pom.xml b/kotlin/pom.xml
index 68944f08ac..f928cc4037 100644
--- a/kotlin/pom.xml
+++ b/kotlin/pom.xml
@@ -28,9 +28,8 @@
         </dependency>
     </dependencies>
 
+
     <build>
-        <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
-        <testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>kotlin-maven-plugin</artifactId>
@@ -38,29 +37,51 @@
                 <version>${kotlin-maven-plugin.version}</version>
                 <executions>
                     <execution>
-                        <configuration>
-                            <sourceDirs>
-                                <source>src/main/java</source>
-                                <source>src/main/kotlin</source>
-                            </sourceDirs>
-                        </configuration>
                         <id>compile</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                    </execution>
-
-                    <execution>
+                        <goals> <goal>compile</goal> </goals>
                         <configuration>
                             <sourceDirs>
-                                <source>src/test/java</source>
-                                <source>src/test/kotlin</source>
+                                <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>
+                        <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.5.1</version>
+                <executions>
+                    <!-- Replacing default-compile as it is treated specially by maven -->
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <!-- Replacing default-testCompile as it is treated specially by maven -->
+                    <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>
@@ -69,9 +90,10 @@
 
     <properties>
         <junit.version>4.12</junit.version>
-        <kotlin-test-junit.version>1.0.4</kotlin-test-junit.version>
-        <kotlin-stdlib.version>1.0.4</kotlin-stdlib.version>
-        <kotlin-maven-plugin.version>1.0.4</kotlin-maven-plugin.version>
+        <kotlin-maven-plugin.version>1.0.6</kotlin-maven-plugin.version>
+        <kotlin-test-junit.version>1.0.6</kotlin-test-junit.version>
+        <kotlin-stdlib.version>1.0.6</kotlin-stdlib.version>
+        <kotlin-maven-plugin.version>1.0.6</kotlin-maven-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinScalaInteroperabilityTest.kt b/kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinScalaInteroperabilityTest.kt
index f671c3af8b..6ba7f0976f 100644
--- a/kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinScalaInteroperabilityTest.kt
+++ b/kotlin/src/test/kotlin/com/baeldung/kotlin/KotlinScalaInteroperabilityTest.kt
@@ -6,12 +6,13 @@ import kotlin.test.assertEquals
 
 
 class KotlinScalaInteroperabilityTest {
+
     @Test
     fun givenLowercaseString_whenExecuteMethodFromJavaStringUtils_shouldReturnStringUppercase() {
         //given
         val name = "tom"
 
-        //when
+        //whene
         val res = StringUtils.toUpperCase(name)
 
         //then