Skip to content

Commit 891293b

Browse files
rbrirbri
committed
use modules argline for all profiles
1 parent 1311ac4 commit 891293b

1 file changed

Lines changed: 24 additions & 21 deletions

File tree

‎pom.xml‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@
2727
<maven.compiler.source>17</maven.compiler.source>
2828
<maven.compiler.target>17</maven.compiler.target>
2929

30+
<surefire.argLine.modules>
31+
--add-modules org.slf4j
32+
--add-reads org.htmlunit=org.apache.logging.log4j
33+
--add-reads org.htmlunit=org.apache.logging.log4j.core
34+
--add-opens org.htmlunit/org.htmlunit=ALL-UNNAMED
35+
--add-opens org.htmlunit/org.htmlunit.junit=ALL-UNNAMED
36+
</surefire.argLine.modules>
37+
3038
<maven.version.ignore>(?i).*-(alpha|beta|m|rc)([\.-]?\d+)?</maven.version.ignore>
3139

3240
<htmlunitcsp.version>5.0.0-SNAPSHOT</htmlunitcsp.version>
@@ -81,6 +89,7 @@
8189
<source-plugin.version>3.4.0</source-plugin.version>
8290
<javadoc-plugin.version>3.12.0</javadoc-plugin.version>
8391
<surefire-plugin.version>3.5.4</surefire-plugin.version>
92+
<site-plugin.version>3.21.0</site-plugin.version>
8493
<jacoco-plugin.version>0.8.14</jacoco-plugin.version>
8594
<cyclonedx-plugin.version>2.9.1</cyclonedx-plugin.version>
8695
</properties>
@@ -185,7 +194,7 @@
185194
<plugin>
186195
<groupId>org.apache.maven.plugins</groupId>
187196
<artifactId>maven-site-plugin</artifactId>
188-
<version>3.12.0</version>
197+
<version>${site-plugin.version}</version>
189198
</plugin>
190199
<plugin>
191200
<groupId>org.apache.maven.plugins</groupId>
@@ -226,13 +235,7 @@
226235
<artifactId>maven-surefire-plugin</artifactId>
227236
<version>${surefire-plugin.version}</version>
228237
<configuration>
229-
<argLine>
230-
--add-modules org.slf4j
231-
--add-reads org.htmlunit=org.apache.logging.log4j
232-
--add-reads org.htmlunit=org.apache.logging.log4j.core
233-
--add-opens org.htmlunit/org.htmlunit=ALL-UNNAMED
234-
--add-opens org.htmlunit/org.htmlunit.junit=ALL-UNNAMED
235-
</argLine>
238+
<argLine>${surefire.argLine.modules}</argLine>
236239
</configuration>
237240
</plugin>
238241
<plugin>
@@ -392,7 +395,7 @@
392395
<exclude>**/huge/*.java</exclude>
393396
<exclude>**/encoding/*.java</exclude>
394397
</excludes>
395-
<argLine>-Xms128m -Xmx1g -Dsun.reflect.noInflation=true</argLine>
398+
<argLine>${surefire.argLine.modules} -Xms128m -Xmx1g -Dsun.reflect.noInflation=true</argLine>
396399
<systemPropertyVariables>
397400
<htmlunit.maven>maven</htmlunit.maven>
398401
</systemPropertyVariables>
@@ -453,7 +456,7 @@
453456
<excludes>
454457
<exclude>**/libraries/jquery/JQuery3x3x1Test.java</exclude>
455458
</excludes>
456-
<argLine>-Xms128m -Xmx512m</argLine>
459+
<argLine>${surefire.argLine.modules} -Xms128m -Xmx512m</argLine>
457460
<systemPropertyVariables>
458461
<htmlunit.maven>maven</htmlunit.maven>
459462
</systemPropertyVariables>
@@ -481,7 +484,7 @@
481484
<includes>
482485
<include>**/libraries/JQuery3x3x1Test.java</include>
483486
</includes>
484-
<argLine>-Xms128m -Xmx512m</argLine>
487+
<argLine>${surefire.argLine.modules} -Xms128m -Xmx512m</argLine>
485488
<systemPropertyVariables>
486489
<htmlunit.maven>maven</htmlunit.maven>
487490
</systemPropertyVariables>
@@ -511,7 +514,7 @@
511514
<include>**/huge/ElementClosesElementTest.java</include>
512515
<include>**/huge/ElementClosesElement2Test.java</include>
513516
</includes>
514-
<argLine>-Xms256m -Xmx512m</argLine>
517+
<argLine>${surefire.argLine.modules} -Xms256m -Xmx512m</argLine>
515518
<systemPropertyVariables>
516519
<htmlunit.maven>maven</htmlunit.maven>
517520
</systemPropertyVariables>
@@ -541,7 +544,7 @@
541544
<include>**/huge/HostParentOfBTest.java</include>
542545
<include>**/huge/HostParentOfCTest.java</include>
543546
</includes>
544-
<argLine>-Xms512m -Xmx1024m</argLine>
547+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
545548
<systemPropertyVariables>
546549
<htmlunit.maven>maven</htmlunit.maven>
547550
</systemPropertyVariables>
@@ -570,7 +573,7 @@
570573
<include>**/huge/HostParentOfDTest.java</include>
571574
<include>**/huge/HostParentOfFTest.java</include>
572575
</includes>
573-
<argLine>-Xms512m -Xmx1024m</argLine>
576+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
574577
<systemPropertyVariables>
575578
<htmlunit.maven>maven</htmlunit.maven>
576579
</systemPropertyVariables>
@@ -599,7 +602,7 @@
599602
<include>**/huge/HostParentOfHTest.java</include>
600603
<include>**/huge/HostParentOfITest.java</include>
601604
</includes>
602-
<argLine>-Xms512m -Xmx1024m</argLine>
605+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
603606
<systemPropertyVariables>
604607
<htmlunit.maven>maven</htmlunit.maven>
605608
</systemPropertyVariables>
@@ -628,7 +631,7 @@
628631
<include>**/huge/HostParentOfMTest.java</include>
629632
<include>**/huge/HostParentOfNTest.java</include>
630633
</includes>
631-
<argLine>-Xms512m -Xmx1024m</argLine>
634+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
632635
<systemPropertyVariables>
633636
<htmlunit.maven>maven</htmlunit.maven>
634637
</systemPropertyVariables>
@@ -656,7 +659,7 @@
656659
<includes>
657660
<include>**/huge/HostParentOfPTest.java</include>
658661
</includes>
659-
<argLine>-Xms512m -Xmx1024m</argLine>
662+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
660663
<systemPropertyVariables>
661664
<htmlunit.maven>maven</htmlunit.maven>
662665
</systemPropertyVariables>
@@ -684,7 +687,7 @@
684687
<includes>
685688
<include>**/huge/HostParentOfSTest.java</include>
686689
</includes>
687-
<argLine>-Xms512m -Xmx1024m</argLine>
690+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
688691
<systemPropertyVariables>
689692
<htmlunit.maven>maven</htmlunit.maven>
690693
</systemPropertyVariables>
@@ -712,7 +715,7 @@
712715
<includes>
713716
<include>**/huge/HostParentOfS2Test.java</include>
714717
</includes>
715-
<argLine>-Xms512m -Xmx1024m</argLine>
718+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
716719
<systemPropertyVariables>
717720
<htmlunit.maven>maven</htmlunit.maven>
718721
</systemPropertyVariables>
@@ -741,7 +744,7 @@
741744
<include>**/huge/HostParentOfTTest.java</include>
742745
<include>**/huge/HostParentOfWTest.java</include>
743746
</includes>
744-
<argLine>-Xms512m -Xmx1024m</argLine>
747+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
745748
<systemPropertyVariables>
746749
<htmlunit.maven>maven</htmlunit.maven>
747750
</systemPropertyVariables>
@@ -769,7 +772,7 @@
769772
<includes>
770773
<include>**/encoding/**</include>
771774
</includes>
772-
<argLine>-Xms512m -Xmx1024m</argLine>
775+
<argLine>${surefire.argLine.modules} -Xms512m -Xmx1024m</argLine>
773776
<systemPropertyVariables>
774777
<htmlunit.maven>maven</htmlunit.maven>
775778
</systemPropertyVariables>

0 commit comments

Comments
 (0)