Skip to content

Commit 970ec59

Browse files
committed
fix testsuite/data compiler interaction with Eclipse m2e
Signed-off-by: Michael Edgar <michael@xlate.io>
1 parent 3d098fc commit 970ec59

File tree

1 file changed

+45
-32
lines changed

1 file changed

+45
-32
lines changed

testsuite/data/pom.xml

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<version>${kotlin.version}</version>
193193
<executions>
194194
<execution>
195-
<id>compile</id>
195+
<id>kotlin-compile</id>
196196
<goals>
197197
<goal>compile</goal>
198198
</goals>
@@ -204,7 +204,7 @@
204204
</configuration>
205205
</execution>
206206
<execution>
207-
<id>test-compile</id>
207+
<id>kotlin-test-compile</id>
208208
<goals>
209209
<goal>test-compile</goal>
210210
</goals>
@@ -229,36 +229,6 @@
229229
</dependency>
230230
</dependencies>
231231
</plugin>
232-
<plugin>
233-
<groupId>org.apache.maven.plugins</groupId>
234-
<artifactId>maven-compiler-plugin</artifactId>
235-
<executions>
236-
<!-- Replacing default-compile as it is treated specially by maven -->
237-
<execution>
238-
<id>default-compile</id>
239-
<phase>none</phase>
240-
</execution>
241-
<!-- Replacing default-testCompile as it is treated specially by maven -->
242-
<execution>
243-
<id>default-testCompile</id>
244-
<phase>none</phase>
245-
</execution>
246-
<execution>
247-
<id>java-compile</id>
248-
<phase>compile</phase>
249-
<goals>
250-
<goal>compile</goal>
251-
</goals>
252-
</execution>
253-
<execution>
254-
<id>java-test-compile</id>
255-
<phase>test-compile</phase>
256-
<goals>
257-
<goal>testCompile</goal>
258-
</goals>
259-
</execution>
260-
</executions>
261-
</plugin>
262232
<plugin>
263233
<groupId>io.quarkus</groupId>
264234
<artifactId>quarkus-maven-plugin</artifactId>
@@ -340,6 +310,49 @@
340310
</build>
341311

342312
<profiles>
313+
<profile>
314+
<id>m2e-absent</id>
315+
<activation>
316+
<property>
317+
<name>!m2e.version</name>
318+
</property>
319+
</activation>
320+
<build>
321+
<plugins>
322+
<plugin>
323+
<groupId>org.apache.maven.plugins</groupId>
324+
<artifactId>maven-compiler-plugin</artifactId>
325+
<executions>
326+
<!-- Replacing default-compile as it is treated specially by maven -->
327+
<execution>
328+
<id>default-compile</id>
329+
<phase>none</phase>
330+
</execution>
331+
<!-- Replacing default-testCompile as it is treated specially by maven -->
332+
<execution>
333+
<id>default-testCompile</id>
334+
<phase>none</phase>
335+
</execution>
336+
<execution>
337+
<id>java-compile</id>
338+
<phase>compile</phase>
339+
<goals>
340+
<goal>compile</goal>
341+
</goals>
342+
</execution>
343+
<execution>
344+
<id>java-test-compile</id>
345+
<phase>test-compile</phase>
346+
<goals>
347+
<goal>testCompile</goal>
348+
</goals>
349+
</execution>
350+
</executions>
351+
</plugin>
352+
</plugins>
353+
</build>
354+
</profile>
355+
343356
<profile>
344357
<id>coverage</id>
345358
<properties>

0 commit comments

Comments
 (0)