Skip to content

Commit 3131d4d

Browse files
anastasiosioannidisanastasiosioannidis
authored
JAVA-33541 : Fix build time of kotlin spring plugin in kotlin modules.
2 parents 2f42904 + 78a4464 commit 3131d4d

File tree

3 files changed

+87
-11
lines changed

3 files changed

+87
-11
lines changed

‎spring-boot-kotlin-2/pom.xml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,40 @@
6363
<groupId>org.springframework.boot</groupId>
6464
<artifactId>spring-boot-maven-plugin</artifactId>
6565
</plugin>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-compiler-plugin</artifactId>
69+
<version>${maven-compiler-plugin.version}</version>
70+
<configuration>
71+
<source>${java.version}</source>
72+
<target>${java.version}</target>
73+
</configuration>
74+
<executions>
75+
<!-- Replacing default-compile as it is treated specially by maven -->
76+
<execution>
77+
<id>default-compile</id>
78+
<phase>none</phase>
79+
</execution>
80+
<!-- Replacing default-testCompile as it is treated specially by maven -->
81+
<execution>
82+
<id>default-testCompile</id>
83+
<phase>none</phase>
84+
</execution>
85+
<execution>
86+
<id>java-compile</id>
87+
<phase>none</phase>
88+
</execution>
89+
<execution>
90+
<id>java-test-compile</id>
91+
<phase>none</phase>
92+
</execution>
93+
</executions>
94+
</plugin>
6695
<plugin>
6796
<artifactId>kotlin-maven-plugin</artifactId>
6897
<groupId>org.jetbrains.kotlin</groupId>
6998
<version>${kotlin.version}</version>
7099
<configuration>
71-
<args>
72-
<arg>-Xjsr305=strict</arg>
73-
</args>
74100
<compilerPlugins>
75101
<plugin>spring</plugin>
76102
</compilerPlugins>
@@ -98,7 +124,6 @@
98124
<configuration>
99125
<sourceDirs>
100126
<sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
101-
<sourceDir>${project.basedir}/src/main/java</sourceDir>
102127
</sourceDirs>
103128
</configuration>
104129
</execution>
@@ -111,7 +136,6 @@
111136
<configuration>
112137
<sourceDirs>
113138
<sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
114-
<sourceDir>${project.basedir}/src/test/java</sourceDir>
115139
</sourceDirs>
116140
</configuration>
117141
</execution>

‎spring-boot-kotlin/pom.xml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,40 @@
8080

8181
<build>
8282
<plugins>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-compiler-plugin</artifactId>
86+
<version>${maven-compiler-plugin.version}</version>
87+
<configuration>
88+
<source>${java.version}</source>
89+
<target>${java.version}</target>
90+
</configuration>
91+
<executions>
92+
<!-- Replacing default-compile as it is treated specially by maven -->
93+
<execution>
94+
<id>default-compile</id>
95+
<phase>none</phase>
96+
</execution>
97+
<!-- Replacing default-testCompile as it is treated specially by maven -->
98+
<execution>
99+
<id>default-testCompile</id>
100+
<phase>none</phase>
101+
</execution>
102+
<execution>
103+
<id>java-compile</id>
104+
<phase>none</phase>
105+
</execution>
106+
<execution>
107+
<id>java-test-compile</id>
108+
<phase>none</phase>
109+
</execution>
110+
</executions>
111+
</plugin>
83112
<plugin>
84113
<groupId>org.jetbrains.kotlin</groupId>
85114
<artifactId>kotlin-maven-plugin</artifactId>
86115
<version>${kotlin.version}</version>
87116
<configuration>
88-
<args>
89-
<arg>-Xjsr305=strict</arg>
90-
</args>
91117
<compilerPlugins>
92118
<plugin>spring</plugin>
93119
</compilerPlugins>

‎spring-boot-test-kotlin/pom.xml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,39 @@
7979
<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
8080
<testSourceDirectory>${project.basedir}/src/test/kotlin</testSourceDirectory>
8181
<plugins>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-compiler-plugin</artifactId>
85+
<version>${maven-compiler-plugin.version}</version>
86+
<configuration>
87+
<source>${java.version}</source>
88+
<target>${java.version}</target>
89+
</configuration>
90+
<executions>
91+
<!-- Replacing default-compile as it is treated specially by maven -->
92+
<execution>
93+
<id>default-compile</id>
94+
<phase>none</phase>
95+
</execution>
96+
<!-- Replacing default-testCompile as it is treated specially by maven -->
97+
<execution>
98+
<id>default-testCompile</id>
99+
<phase>none</phase>
100+
</execution>
101+
<execution>
102+
<id>java-compile</id>
103+
<phase>none</phase>
104+
</execution>
105+
<execution>
106+
<id>java-test-compile</id>
107+
<phase>none</phase>
108+
</execution>
109+
</executions>
110+
</plugin>
82111
<plugin>
83112
<groupId>org.jetbrains.kotlin</groupId>
84113
<artifactId>kotlin-maven-plugin</artifactId>
85114
<configuration>
86-
<args>
87-
<arg>-Xjsr305=strict</arg>
88-
</args>
89115
<compilerPlugins>
90116
<plugin>spring</plugin>
91117
<plugin>jpa</plugin>

0 commit comments

Comments
 (0)