Skip to content

Commit 4c59d84

Browse files
committed
DATAMONGO-1689 - Polishing.
Bring back Maven Kotlin configuration for now + documentation fixes.
1 parent a19287c commit 4c59d84

File tree

3 files changed

+130
-111
lines changed

3 files changed

+130
-111
lines changed

spring-data-mongodb/pom.xml

Lines changed: 75 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<properties>
1919
<objenesis>1.3</objenesis>
2020
<equalsverifier>1.5</equalsverifier>
21+
<kotlin>1.1.2-5</kotlin>
2122
</properties>
2223

2324
<dependencies>
@@ -232,7 +233,7 @@
232233
</dependency>
233234
<dependency>
234235
<groupId>org.jetbrains.kotlin</groupId>
235-
<artifactId>kotlin-stdlib-jre8</artifactId>
236+
<artifactId>kotlin-stdlib</artifactId>
236237
<version>${kotlin}</version>
237238
<optional>true</optional>
238239
</dependency>
@@ -251,15 +252,87 @@
251252
<dependency>
252253
<groupId>com.nhaarman</groupId>
253254
<artifactId>mockito-kotlin</artifactId>
254-
<version>1.4.0</version>
255+
<version>1.5.0</version>
255256
<scope>test</scope>
257+
<exclusions>
258+
<exclusion>
259+
<groupId>org.jetbrains.kotlin</groupId>
260+
<artifactId>kotlin-stdlib</artifactId>
261+
</exclusion>
262+
<exclusion>
263+
<groupId>org.jetbrains.kotlin</groupId>
264+
<artifactId>kotlin-reflect</artifactId>
265+
</exclusion>
266+
<exclusion>
267+
<groupId>org.mockito</groupId>
268+
<artifactId>mockito-core</artifactId>
269+
</exclusion>
270+
</exclusions>
256271
</dependency>
257272

258273
</dependencies>
259274

260275
<build>
261276
<plugins>
262277

278+
<plugin>
279+
<artifactId>kotlin-maven-plugin</artifactId>
280+
<groupId>org.jetbrains.kotlin</groupId>
281+
<version>${kotlin}</version>
282+
<configuration>
283+
<jvmTarget>1.8</jvmTarget>
284+
</configuration>
285+
<executions>
286+
<execution>
287+
<id>compile</id>
288+
<phase>compile</phase>
289+
<goals> <goal>compile</goal> </goals>
290+
<configuration>
291+
<sourceDirs>
292+
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
293+
<sourceDir>${project.basedir}/src/main/java</sourceDir>
294+
</sourceDirs>
295+
</configuration>
296+
</execution>
297+
<execution>
298+
<id>test-compile</id>
299+
<phase>test-compile</phase>
300+
<goals> <goal>test-compile</goal> </goals>
301+
<configuration>
302+
<sourceDirs>
303+
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
304+
<sourceDir>${project.basedir}/src/test/java</sourceDir>
305+
</sourceDirs>
306+
</configuration>
307+
</execution>
308+
</executions>
309+
</plugin>
310+
311+
<plugin>
312+
<groupId>org.apache.maven.plugins</groupId>
313+
<artifactId>maven-compiler-plugin</artifactId>
314+
<executions>
315+
<execution>
316+
<id>default-compile</id>
317+
<phase>none</phase>
318+
</execution>
319+
<execution>
320+
<id>default-testCompile</id>
321+
<phase>none</phase>
322+
</execution>
323+
<execution>
324+
<id>java-compile</id>
325+
<phase>compile</phase>
326+
<goals> <goal>compile</goal> </goals>
327+
</execution>
328+
<execution>
329+
<id>java-test-compile</id>
330+
<phase>test-compile</phase>
331+
<goals> <goal>testCompile</goal> </goals>
332+
</execution>
333+
</executions>
334+
</plugin>
335+
263336
<plugin>
264337
<groupId>com.mysema.maven</groupId>
265338
<artifactId>apt-maven-plugin</artifactId>

0 commit comments

Comments
 (0)