Skip to content

Commit 304832d

Browse files
committed
Remove unnecessary slf4j dependency
- causes problems for the logback appender tests - also make the `logs` exchange consistent across all 3 appenders
1 parent 3b96745 commit 304832d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ subprojects { subproject ->
102102
mockitoVersion = '1.10.19'
103103
rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '4.0.3'
104104
rabbitmqHttpClientVersion = '1.1.1.RELEASE'
105-
slf4jVersion = "1.7.25"
106105

107106
springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.25.RELEASE'
108107

@@ -131,7 +130,6 @@ subprojects { subproject ->
131130
exclude group: 'org.hamcrest', module: 'hamcrest-core'
132131
}
133132
testCompile "org.springframework:spring-test:$springVersion"
134-
testCompile "org.slf4j:slf4j-log4j12:$slf4jVersion" // amqp-client now uses SLF4J
135133
}
136134

137135
// enable all compiler warnings; individual projects may customize further

spring-rabbit/src/test/resources/log4j-amqp.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ log4j.appender.amqp.layout=org.apache.log4j.PatternLayout
1212
log4j.appender.amqp.layout.ConversionPattern=%d %p %t [%c] - <%m>%n
1313
log4j.appender.amqp.generateId=true
1414
log4j.appender.amqp.charset=UTF-8
15-
log4j.appender.amqp.durable=false
15+
log4j.appender.amqp.durable=true
1616
log4j.appender.amqp.deliveryMode=NON_PERSISTENT
1717
log4j.appender.amqp.declareExchange=true
1818
log4j.appender.amqp.clientConnectionProperties=foo:bar,baz:qux

0 commit comments

Comments
 (0)