Skip to content

Commit 08ab2e7

Browse files
gsmetgsmet
authored
Merge pull request #9384 from rquinio/bugfix/surefire-system-properties
Use surefire systemPropertyVariables instead of systemProperties
2 parents e50393a + ecf120f commit 08ab2e7

File tree

123 files changed

+312
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+312
-363
lines changed

‎build-parent/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@
228228
<plugin>
229229
<artifactId>maven-surefire-plugin</artifactId>
230230
<configuration>
231-
<systemProperties>
231+
<systemPropertyVariables>
232232
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
233-
</systemProperties>
233+
</systemPropertyVariables>
234234
<argLine>${jacoco.agent.argLine}</argLine>
235235
</configuration>
236236
</plugin>

‎core/builder/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
<artifactId>maven-surefire-plugin</artifactId>
6767
<version>2.21.0</version>
6868
<configuration>
69-
<systemProperties>
69+
<systemPropertyVariables>
7070
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
71-
</systemProperties>
71+
</systemPropertyVariables>
7272
<threadCount>1</threadCount>
7373
<trimStackTrace>false</trimStackTrace>
7474
</configuration>

‎devtools/aesh/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<artifactId>maven-surefire-plugin</artifactId>
4444
<version>2.21.0</version>
4545
<configuration>
46-
<systemProperties>
46+
<systemPropertyVariables>
4747
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
48-
</systemProperties>
48+
</systemPropertyVariables>
4949
<threadCount>1</threadCount>
5050
<trimStackTrace>false</trimStackTrace>
5151
</configuration>

‎devtools/maven/src/main/resources/create-extension-templates/integration-test-pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@
8282
<goal>verify</goal>
8383
</goals>
8484
<configuration>
85-
<systemProperties>
85+
<systemPropertyVariables>
8686
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
87-
</systemProperties>
87+
</systemPropertyVariables>
8888
</configuration>
8989
</execution>
9090
</executions>

‎devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/java/pom.xml-template.ftl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
<artifactId>maven-surefire-plugin</artifactId>
7777
<version>${surefire-plugin.version}</version>
7878
<configuration>
79-
<systemProperties>
79+
<systemPropertyVariables>
8080
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
81-
</systemProperties>
81+
</systemPropertyVariables>
8282
</configuration>
8383
</plugin>
8484
</plugins>
@@ -110,9 +110,9 @@
110110
<goal>verify</goal>
111111
</goals>
112112
<configuration>
113-
<systemProperties>
113+
<systemPropertyVariables>
114114
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
115-
</systemProperties>
115+
</systemPropertyVariables>
116116
</configuration>
117117
</execution>
118118
</executions>

‎devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/kotlin/pom.xml-template.ftl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@
8282
<artifactId>maven-surefire-plugin</artifactId>
8383
<version>${surefire-plugin.version}</version>
8484
<configuration>
85-
<systemProperties>
85+
<systemPropertyVariables>
8686
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
87-
</systemProperties>
87+
</systemPropertyVariables>
8888
</configuration>
8989
</plugin>
9090
<plugin>
@@ -156,9 +156,9 @@
156156
<goal>verify</goal>
157157
</goals>
158158
<configuration>
159-
<systemProperties>
159+
<systemPropertyVariables>
160160
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
161-
</systemProperties>
161+
</systemPropertyVariables>
162162
</configuration>
163163
</execution>
164164
</executions>

‎devtools/platform-descriptor-json/src/main/resources/templates/basic-rest/scala/pom.xml-template.ftl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@
8888
<artifactId>maven-surefire-plugin</artifactId>
8989
<version>${surefire-plugin.version}</version>
9090
<configuration>
91-
<systemProperties>
91+
<systemPropertyVariables>
9292
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
93-
</systemProperties>
93+
</systemPropertyVariables>
9494
</configuration>
9595
</plugin>
9696
<plugin>
@@ -153,9 +153,9 @@
153153
<goal>verify</goal>
154154
</goals>
155155
<configuration>
156-
<systemProperties>
156+
<systemPropertyVariables>
157157
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
158-
</systemProperties>
158+
</systemPropertyVariables>
159159
</configuration>
160160
</execution>
161161
</executions>

‎docs/src/main/asciidoc/building-my-first-extension.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,9 +564,9 @@ Let's add the testing dependencies into the `./quarkus-greeting/deployment/pom.
564564
<artifactId>maven-surefire-plugin</artifactId> <!--3-->
565565
<version>${maven.surefire.version}</version>
566566
<configuration>
567-
<systemProperties>
567+
<systemPropertyVariables>
568568
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
569-
</systemProperties>
569+
</systemPropertyVariables>
570570
</configuration>
571571
</plugin>
572572
</plugins>

‎docs/src/main/asciidoc/building-native-image.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ In the `pom.xml` file, the `native` profile contains:
205205
<goal>verify</goal>
206206
</goals>
207207
<configuration>
208-
<systemProperties>
208+
<systemPropertyVariables>
209209
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
210-
</systemProperties>
210+
</systemPropertyVariables>
211211
</configuration>
212212
</execution>
213213
</executions>

‎docs/src/main/asciidoc/getting-started-testing.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ must be set, as the default version does not support Junit 5:
8585
<artifactId>maven-surefire-plugin</artifactId>
8686
<version>${surefire-plugin.version}</version>
8787
<configuration>
88-
<systemProperties>
88+
<systemPropertyVariables>
8989
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
90-
</systemProperties>
90+
</systemPropertyVariables>
9191
</configuration>
9292
</plugin>
9393
----

0 commit comments

Comments
 (0)