Skip to content

Commit d646f84

Browse files
committed
Eliminate global argLine property
This property name is ambiguous, clashing with the jacoco plugin. So we rename it to scijava.surefire.args, to avoid confusion. This change also eliminates the separate argLineDebug property. If that ends up being a pain later, we can reintroduce it. Closes #12.
1 parent 45be0a6 commit d646f84

1 file changed

Lines changed: 12 additions & 17 deletions

File tree

pom.xml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>org.scijava</groupId>
66
<artifactId>pom-scijava-base</artifactId>
7-
<version>6.0.1-SNAPSHOT</version>
7+
<version>7.0.0-SNAPSHOT</version>
88
<packaging>pom</packaging>
99

1010
<name>SciJava Base POM</name>
@@ -151,15 +151,12 @@
151151
<!-- Copyright owners to use in license headers atop each file. -->
152152
<license.copyrightOwners>N/A</license.copyrightOwners>
153153

154-
<!-- Extra maven-surefire-plugin args. -->
155-
<argLine />
156-
157-
<!-- Extra maven-surefile-plugin args used with debug-port profile. -->
158-
<argLineDebug />
159-
160154
<!-- Classes the enforcer allows to be duplicated on the classpath. -->
161155
<allowedDuplicateClasses />
162156

157+
<!-- Extra maven-surefire-plugin args. -->
158+
<scijava.surefire.args />
159+
163160
<!-- Target version of the Java platform. -->
164161
<scijava.jvm.version>1.8</scijava.jvm.version>
165162
<scijava.jvm.test.version>${scijava.jvm.version}</scijava.jvm.test.version>
@@ -479,19 +476,17 @@
479476
Make sure that:
480477
A) unit tests run with sufficient RAM allocated;
481478
B) unit tests do not pop a Java dock icon on OS X;
482-
C) additional args can be given via argLine property;
479+
C) additional args can be given via scijava.surefire.args property;
483480
484-
Sometimes, one needs to pass JVM options to the JVM
485-
running the unit tests, such as -verbose:class or
486-
-Djava.awt.headless=true.
481+
Sometimes, one needs to pass JVM options to the JVM running the
482+
unit tests, such as -verbose:class or -Djava.awt.headless=true.
487483
488-
Unfortunately, maven-surefire does not expose a
489-
command-line interface to do so, therefore let's
490-
simulate it by re-using the property 'argLine' to
491-
specify those options.
484+
Unfortunately, maven-surefire does not expose a command-line
485+
interface to do so, therefore let's simulate it by using our
486+
own property 'scijava.surefire.args' to specify those options.
492487
-->
493488
<configuration>
494-
<argLine>-Xms512m -Xmx512m -Dapple.awt.UIElement="true" ${argLine} ${argLineDebug}</argLine>
489+
<argLine>-Xms512m -Xmx512m -Dapple.awt.UIElement="true" ${scijava.surefire.args}</argLine>
495490
</configuration>
496491
</plugin>
497492

@@ -1379,7 +1374,7 @@
13791374
<property><name>debugPort</name></property>
13801375
</activation>
13811376
<properties>
1382-
<argLineDebug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=localhost:${debugPort}</argLineDebug>
1377+
<scijava.surefire.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=localhost:${debugPort}</scijava.surefire.args>
13831378
</properties>
13841379
</profile>
13851380

0 commit comments

Comments
 (0)