Skip to content

Commit e39e611

Browse files
mattrpavmattrpav
committed
[NO-JIRA] Convert surefire plugin from systemProperties to systemPropertyVariables
1 parent d600a25 commit e39e611

File tree

10 files changed

+38
-77
lines changed

10 files changed

+38
-77
lines changed

‎activemq-broker/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,9 @@
186186
<reuseForks>false</reuseForks>
187187
<argLine>${surefire.argLine}</argLine>
188188
<runOrder>alphabetical</runOrder>
189-
<systemProperties>
190-
<property>
191-
<name>org.apache.activemq.default.directory.prefix</name>
192-
<value>target/</value>
193-
</property>
194-
</systemProperties>
189+
<systemPropertyVariables>
190+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
191+
</systemPropertyVariables>
195192
<includes>
196193
<include>**/*Test.*</include>
197194
</includes>

‎activemq-client/pom.xml

+4-8
Original file line numberDiff line numberDiff line change
@@ -220,18 +220,14 @@
220220
<reuseForks>false</reuseForks>
221221
<argLine>${surefire.argLine}</argLine>
222222
<runOrder>alphabetical</runOrder>
223-
<systemProperties>
224-
<property>
225-
<name>org.apache.activemq.default.directory.prefix</name>
226-
<value>target/</value>
227-
</property>
223+
<systemPropertyVariables>
224+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
228225
<!-- Uncomment the following if you want to configure custom logging
229226
(using src/test/resources/log4j.properties) while running mvn:test Note: if you want
230227
to see log messages on the console window remove "redirectTestOutputToFile" from
231228
the parent pom -->
232-
<!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
233-
</property> -->
234-
</systemProperties>
229+
<!-- <log4j.configuration>file:target/test-classes/log4j.properties</log4j.configuration> -->
230+
</systemPropertyVariables>
235231
<includes>
236232
<include>**/*Test.*</include>
237233
</includes>

‎activemq-console/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,14 @@
152152
<reuseForks>false</reuseForks>
153153
<childDelegation>false</childDelegation>
154154
<useFile>true</useFile>
155-
<systemProperties>
156-
<property>
157-
<name>org.apache.activemq.default.directory.prefix</name>
158-
<value>target/</value>
159-
</property>
155+
<systemPropertyVariables>
156+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
160157
<!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j2-test.properties)
161158
while running mvn:test Note: if you want to see log messages on the console window remove "redirectTestOutputToFile"
162159
from the parent pom -->
163160
<!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j2-test.properties</value>
164161
</property> -->
165-
</systemProperties>
162+
</systemPropertyVariables>
166163
<includes>
167164
<include>**/*Test*</include>
168165
</includes>

‎activemq-jaas/pom.xml

+4-12
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,15 @@
3939
<useFile>true</useFile>
4040
<argLine>-Xmx512M</argLine>
4141

42-
<systemProperties>
43-
<property>
44-
<name>org.apache.activemq.default.directory.prefix</name>
45-
<value>target/</value>
46-
</property>
42+
<systemPropertyVariables>
43+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
4744
<!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j.properties)
4845
while running mvn:test
4946
Note: if you want to see log messages on the console window remove
5047
"redirectTestOutputToFile" from the parent pom
5148
-->
52-
<!--
53-
<property>
54-
<name>log4j.configuration</name>
55-
<value>file:target/test-classes/log4j.properties</value>
56-
</property>
57-
-->
58-
</systemProperties>
49+
<!-- <log4j.configuration>file:target/test-classes/log4j.properties</log4j.configuration> -->
50+
</systemPropertyVariables>
5951
<environmentVariables>
6052
<ACTIVEMQ_ENCRYPTION_PASSWORD>activemq</ACTIVEMQ_ENCRYPTION_PASSWORD>
6153
</environmentVariables>

‎activemq-jdbc-store/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,8 @@
105105
<reuseForks>false</reuseForks>
106106
<argLine>${surefire.argLine}</argLine>
107107
<runOrder>alphabetical</runOrder>
108-
<systemProperties>
109-
<property>
110-
<name>org.apache.activemq.default.directory.prefix</name>
111-
<value>target/</value>
112-
</property>
108+
<systemPropertyVariables>
109+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
113110
<!-- Uncomment the following if you want to configure custom logging (using src/test/resources/log4j2-test.properties)
114111
while running mvn:test
115112
Note: if you want to see log messages on the console window remove
@@ -121,7 +118,7 @@
121118
<value>file:target/test-classes/log4j2-test.properties</value>
122119
</property>
123120
-->
124-
</systemProperties>
121+
</systemPropertyVariables>
125122
<includes>
126123
<include>**/*Test.*</include>
127124
</includes>

‎activemq-kahadb-store/pom.xml

+3-7
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,9 @@
180180
<reuseForks>false</reuseForks>
181181
<argLine>${surefire.argLine}</argLine>
182182
<runOrder>alphabetical</runOrder>
183-
184-
<systemProperties>
185-
<property>
186-
<name>org.apache.activemq.default.directory.prefix</name>
187-
<value>target/</value>
188-
</property>
189-
</systemProperties>
183+
<systemPropertyVariables>
184+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
185+
</systemPropertyVariables>
190186
<includes>
191187
<include>**/*Test.*</include>
192188
</includes>

‎activemq-mqtt/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,9 @@
205205
<reuseForks>false</reuseForks>
206206
<argLine>${surefire.argLine}</argLine>
207207
<runOrder>alphabetical</runOrder>
208-
<systemProperties>
209-
<property>
210-
<name>org.apache.activemq.default.directory.prefix</name>
211-
<value>target/</value>
212-
</property>
213-
</systemProperties>
208+
<systemPropertyValues>
209+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
210+
</systemPropertyValues>
214211
<!-- includes>
215212
<include>**/*Test.*</include>
216213
</includes -->

‎activemq-runtime-config/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,13 @@
150150
<forkCount>1</forkCount>
151151
<reuseForks>false</reuseForks>
152152
<argLine>-Xmx512M -Djava.awt.headless=true</argLine>
153-
<systemProperties>
154-
<property>
155-
<name>org.apache.activemq.default.directory.prefix</name>
156-
<value>target/</value>
157-
</property>
153+
<systemPropertyVariables>
154+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
158155
<property>
159156
<name>log4j.configuration</name>
160157
<value>file:target/test-classes/log4j.properties</value>
161158
</property>
162-
</systemProperties>
159+
</systemPropertyVariables>
163160
<includes>
164161
<include>**/*Test.*</include>
165162
</includes>

‎activemq-shiro/pom.xml

+9-14
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,18 @@
157157
<argLine>${surefire.argLine}</argLine>
158158
<runOrder>alphabetical</runOrder>
159159
<failIfNoTests>false</failIfNoTests>
160-
<systemProperties>
161-
<property>
162-
<name>org.apache.activemq.default.directory.prefix</name>
163-
<value>target/</value>
164-
</property>
165-
<!- - Uncomment the following if you want to configure custom logging (using src/test/resources/log4j2-test.properties)
160+
<systemPropertyVariables>
161+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
162+
<!- -
163+
Uncomment the following if you want to configure custom logging (using src/test/resources/log4j2-test.properties)
166164
while running mvn:test
167165
Note: if you want to see log messages on the console window remove
168166
"redirectTestOutputToFile" from the parent pom
169-
- ->
170-
<!- -
171-
<property>
172-
<name>log4j.configuration</name>
173-
<value>file:target/test-classes/log4j2-test.properties</value>
174-
</property>
175-
- ->
176-
</systemProperties>
167+
- ->
168+
<!- -
169+
<log4j.configuration>file:target/test-classes/log4j2-test.properties</log4j.configuration>
170+
- ->
171+
</systemPropertyVariables>
177172
<includes>
178173
<include>**/*Test.*</include>
179174
</includes>

‎activemq-stomp/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,9 @@
132132
<argLine>${surefire.argLine}</argLine>
133133
<runOrder>alphabetical</runOrder>
134134
<failIfNoTests>false</failIfNoTests>
135-
<systemProperties>
136-
<property>
137-
<name>org.apache.activemq.default.directory.prefix</name>
138-
<value>target/</value>
139-
</property>
140-
</systemProperties>
135+
<systemPropertyVariables>
136+
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
137+
</systemPropertyVariables>
141138
<includes>
142139
<include>**/*Test.*</include>
143140
</includes>

0 commit comments

Comments
 (0)