Skip to content

Commit 168f647

Browse files
jvalkealjvalkeal
committed
Adapt to logging changes
- Moving over to log4j2 for test logging. - Need to follow what happens to commons-logging per SPR-14512. - Relates to #394
1 parent 78527fd commit 168f647

File tree

11 files changed

+71
-46
lines changed

11 files changed

+71
-46
lines changed

‎build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ project('spring-statemachine-core') {
180180
testCompile "org.springframework.security:spring-security-config"
181181
testCompile "org.springframework.security:spring-security-test"
182182
testCompile "javax.servlet:javax.servlet-api"
183-
testRuntime "log4j:log4j"
183+
testRuntime "org.apache.logging.log4j:log4j-core"
184184
}
185185
}
186186

@@ -232,7 +232,7 @@ project('spring-statemachine-kryo') {
232232
testCompile "org.hamcrest:hamcrest-core"
233233
testCompile "org.hamcrest:hamcrest-library"
234234
testCompile "junit:junit"
235-
testRuntime "log4j:log4j"
235+
testRuntime "org.apache.logging.log4j:log4j-core"
236236
}
237237
}
238238

@@ -252,7 +252,7 @@ project('spring-statemachine-zookeeper') {
252252
testCompile "org.hamcrest:hamcrest-core"
253253
testCompile "org.hamcrest:hamcrest-library"
254254
testCompile "junit:junit"
255-
testRuntime "log4j:log4j"
255+
testRuntime "org.apache.logging.log4j:log4j-core"
256256
}
257257
}
258258

@@ -270,7 +270,7 @@ project('spring-statemachine-redis') {
270270
testCompile "org.hamcrest:hamcrest-core"
271271
testCompile "org.hamcrest:hamcrest-library"
272272
testCompile "junit:junit"
273-
testRuntime "log4j:log4j"
273+
testRuntime "org.apache.logging.log4j:log4j-core"
274274
}
275275
}
276276

@@ -310,7 +310,7 @@ project('spring-statemachine-cluster') {
310310
testCompile "org.hamcrest:hamcrest-core"
311311
testCompile "org.hamcrest:hamcrest-library"
312312
testCompile "junit:junit"
313-
testRuntime "log4j:log4j"
313+
testRuntime "org.apache.logging.log4j:log4j-core"
314314
}
315315
}
316316

@@ -347,7 +347,7 @@ project('spring-statemachine-uml') {
347347
testCompile "org.hamcrest:hamcrest-core"
348348
testCompile "org.hamcrest:hamcrest-library"
349349
testCompile "junit:junit"
350-
testRuntime "log4j:log4j"
350+
testRuntime "org.apache.logging.log4j:log4j-core"
351351
}
352352
}
353353

‎spring-statemachine-core/src/test/resources/log4j.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎spring-statemachine-core/src/test/resources/log4j2.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Configuration>
2+
<Appenders>
3+
<Console name="STDOUT" target="SYSTEM_OUT">
4+
<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
5+
</Console>
6+
</Appenders>
7+
<Loggers>
8+
<Logger name="org.springframework.statemachine" level="debug"/>
9+
<Root level="info">
10+
<AppenderRef ref="STDOUT"/>
11+
</Root>
12+
</Loggers>
13+
</Configuration>

‎spring-statemachine-recipes/src/test/resources/log4j.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎spring-statemachine-recipes/src/test/resources/log4j2.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Configuration>
2+
<Appenders>
3+
<Console name="STDOUT" target="SYSTEM_OUT">
4+
<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
5+
</Console>
6+
</Appenders>
7+
<Loggers>
8+
<Logger name="org.springframework.statemachine" level="debug"/>
9+
<Root level="info">
10+
<AppenderRef ref="STDOUT"/>
11+
</Root>
12+
</Loggers>
13+
</Configuration>

‎spring-statemachine-samples/cdplayer/src/test/resources/log4j.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎spring-statemachine-samples/cdplayer/src/test/resources/log4j2.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Configuration>
2+
<Appenders>
3+
<Console name="STDOUT" target="SYSTEM_OUT">
4+
<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
5+
</Console>
6+
</Appenders>
7+
<Loggers>
8+
<Logger name="org.springframework.statemachine" level="debug"/>
9+
<Root level="info">
10+
<AppenderRef ref="STDOUT"/>
11+
</Root>
12+
</Loggers>
13+
</Configuration>

‎spring-statemachine-samples/tasks/src/test/resources/log4j.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎spring-statemachine-samples/tasks/src/test/resources/log4j2.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Configuration>
2+
<Appenders>
3+
<Console name="STDOUT" target="SYSTEM_OUT">
4+
<PatternLayout pattern="%d{ABSOLUTE} %5p %t %c{2} [%t] - %m%n"/>
5+
</Console>
6+
</Appenders>
7+
<Loggers>
8+
<Logger name="org.springframework.statemachine" level="debug"/>
9+
<Root level="info">
10+
<AppenderRef ref="STDOUT"/>
11+
</Root>
12+
</Loggers>
13+
</Configuration>

‎spring-statemachine-zookeeper/src/test/resources/log4j.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)