Skip to content

Commit ae60196

Browse files
committed
Move surefire config to parent pom pluginManagement
1 parent b910714 commit ae60196

File tree

2 files changed

+55
-44
lines changed

2 files changed

+55
-44
lines changed

net.sourceforge.pmd.eclipse.plugin.test/pom.xml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,6 @@
2222
<plugin>
2323
<groupId>org.eclipse.tycho</groupId>
2424
<artifactId>tycho-surefire-plugin</artifactId>
25-
<configuration>
26-
<useUIHarness>true</useUIHarness>
27-
<useUIThread>false</useUIThread>
28-
<showEclipseLog>true</showEclipseLog>
29-
<trimStackTrace>false</trimStackTrace>
30-
<!-- http://wiki.eclipse.org/Eclipse4/RCP/FAQ#Why_won.27t_my_application_start.3F -->
31-
<bundleStartLevel>
32-
<bundle>
33-
<id>org.eclipse.core.runtime</id>
34-
<level>2</level>
35-
<autoStart>true</autoStart>
36-
</bundle>
37-
<bundle>
38-
<id>org.eclipse.equinox.ds</id>
39-
<level>3</level>
40-
<autoStart>true</autoStart>
41-
</bundle>
42-
<bundle>
43-
<id>org.eclipse.equinox.event</id>
44-
<level>3</level>
45-
<autoStart>true</autoStart>
46-
</bundle>
47-
</bundleStartLevel>
48-
</configuration>
4925
</plugin>
5026
<plugin>
5127
<groupId>org.eclipse.tycho</groupId>
@@ -65,24 +41,4 @@
6541
</plugins>
6642
</build>
6743

68-
<profiles>
69-
<profile>
70-
<id>osx</id>
71-
<activation>
72-
<os><family>mac</family></os>
73-
</activation>
74-
<build>
75-
<plugins>
76-
<plugin>
77-
<groupId>org.eclipse.tycho</groupId>
78-
<artifactId>tycho-surefire-plugin</artifactId>
79-
<configuration>
80-
<argLine>-XstartOnFirstThread</argLine>
81-
</configuration>
82-
</plugin>
83-
</plugins>
84-
</build>
85-
</profile>
86-
</profiles>
87-
8844
</project>

pom.xml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,30 @@
254254
<groupId>org.eclipse.tycho</groupId>
255255
<artifactId>tycho-surefire-plugin</artifactId>
256256
<version>${tycho.version}</version>
257+
<configuration>
258+
<useUIHarness>true</useUIHarness>
259+
<useUIThread>false</useUIThread>
260+
<showEclipseLog>true</showEclipseLog>
261+
<trimStackTrace>false</trimStackTrace>
262+
<!-- http://wiki.eclipse.org/Eclipse4/RCP/FAQ#Why_won.27t_my_application_start.3F -->
263+
<bundleStartLevel>
264+
<bundle>
265+
<id>org.eclipse.core.runtime</id>
266+
<level>2</level>
267+
<autoStart>true</autoStart>
268+
</bundle>
269+
<bundle>
270+
<id>org.eclipse.equinox.ds</id>
271+
<level>3</level>
272+
<autoStart>true</autoStart>
273+
</bundle>
274+
<bundle>
275+
<id>org.eclipse.equinox.event</id>
276+
<level>3</level>
277+
<autoStart>true</autoStart>
278+
</bundle>
279+
</bundleStartLevel>
280+
</configuration>
257281
</plugin>
258282
<plugin>
259283
<groupId>org.eclipse.tycho</groupId>
@@ -447,6 +471,37 @@
447471
</build>
448472
</profile>
449473

474+
<profile>
475+
<id>osx</id>
476+
<activation>
477+
<os>
478+
<family>mac</family>
479+
</os>
480+
</activation>
481+
<build>
482+
<pluginManagement>
483+
<plugins>
484+
<plugin>
485+
<groupId>org.eclipse.tycho</groupId>
486+
<artifactId>tycho-surefire-plugin</artifactId>
487+
<configuration>
488+
<argLine>-XstartOnFirstThread</argLine>
489+
<dependencies combine.children="append">
490+
<!--this dependency is needed to detect and set the default VM correctly on Mac OS,
491+
https://github.com/eclipse-jdt/eclipse.jdt.debug/tree/master/org.eclipse.jdt.launching.macosx -->
492+
<dependency>
493+
<artifactId>org.eclipse.jdt.launching.macosx</artifactId>
494+
<type>eclipse-plugin</type>
495+
<version>0.0.0</version>
496+
</dependency>
497+
</dependencies>
498+
</configuration>
499+
</plugin>
500+
</plugins>
501+
</pluginManagement>
502+
</build>
503+
</profile>
504+
450505
<profile>
451506
<id>sign</id>
452507
<build>

0 commit comments

Comments
 (0)