Skip to content

Commit 1e85bfc

Browse files
christophstroblodrotbohm
authored andcommitted
#369 - Add Kotlin property and plugin to build parent.
Original pull request: #370.
1 parent ab81030 commit 1e85bfc

File tree

1 file changed

+63
-0
lines changed

1 file changed

+63
-0
lines changed

parent/pom.xml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,8 @@
112112
<validation>1.1.0.Final</validation>
113113
<webbeans>1.2.8</webbeans>
114114

115+
<kotlin>1.1.2-3</kotlin>
116+
115117
<releasetrain>Kay-BUILD-SNAPSHOT</releasetrain>
116118

117119
</properties>
@@ -760,13 +762,74 @@
760762
<artifactId>maven-dependency-plugin</artifactId>
761763
</plugin>
762764

765+
<plugin>
766+
<artifactId>kotlin-maven-plugin</artifactId>
767+
<groupId>org.jetbrains.kotlin</groupId>
768+
<version>${kotlin}</version>
769+
<configuration>
770+
<jvmTarget>${source.level}</jvmTarget>
771+
</configuration>
772+
<executions>
773+
<execution>
774+
<id>compile</id>
775+
<phase>compile</phase>
776+
<goals>
777+
<goal>compile</goal>
778+
</goals>
779+
<configuration>
780+
<sourceDirs>
781+
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
782+
<sourceDir>${project.basedir}/src/main/java</sourceDir>
783+
</sourceDirs>
784+
</configuration>
785+
</execution>
786+
<execution>
787+
<id>test-compile</id>
788+
<phase>test-compile</phase>
789+
<goals>
790+
<goal>test-compile</goal>
791+
</goals>
792+
<configuration>
793+
<sourceDirs>
794+
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
795+
<sourceDir>${project.basedir}/src/test/java</sourceDir>
796+
</sourceDirs>
797+
</configuration>
798+
</execution>
799+
</executions>
800+
</plugin>
801+
763802
<plugin>
764803
<groupId>org.apache.maven.plugins</groupId>
765804
<artifactId>maven-compiler-plugin</artifactId>
766805
<configuration>
767806
<source>${source.level}</source>
768807
<target>${source.level}</target>
769808
</configuration>
809+
<executions>
810+
<execution>
811+
<id>default-compile</id>
812+
<phase>none</phase>
813+
</execution>
814+
<execution>
815+
<id>default-testCompile</id>
816+
<phase>none</phase>
817+
</execution>
818+
<execution>
819+
<id>java-compile</id>
820+
<phase>compile</phase>
821+
<goals>
822+
<goal>compile</goal>
823+
</goals>
824+
</execution>
825+
<execution>
826+
<id>java-test-compile</id>
827+
<phase>test-compile</phase>
828+
<goals>
829+
<goal>testCompile</goal>
830+
</goals>
831+
</execution>
832+
</executions>
770833
</plugin>
771834

772835
<plugin>

0 commit comments

Comments
 (0)