From 304832d40713fbb5a1bd793f7cc568265b3eaa55 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 7 Jul 2020 15:10:45 -0400 Subject: [PATCH] Remove unnecessary slf4j dependency - causes problems for the logback appender tests - also make the `logs` exchange consistent across all 3 appenders --- build.gradle | 2 -- spring-rabbit/src/test/resources/log4j-amqp.properties | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 17f159df..bf67a8c5 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,6 @@ subprojects { subproject -> mockitoVersion = '1.10.19' rabbitmqVersion = project.hasProperty('rabbitmqVersion') ? project.rabbitmqVersion : '4.0.3' rabbitmqHttpClientVersion = '1.1.1.RELEASE' - slf4jVersion = "1.7.25" springVersion = project.hasProperty('springVersion') ? project.springVersion : '4.3.25.RELEASE' @@ -131,7 +130,6 @@ subprojects { subproject -> exclude group: 'org.hamcrest', module: 'hamcrest-core' } testCompile "org.springframework:spring-test:$springVersion" - testCompile "org.slf4j:slf4j-log4j12:$slf4jVersion" // amqp-client now uses SLF4J } // enable all compiler warnings; individual projects may customize further diff --git a/spring-rabbit/src/test/resources/log4j-amqp.properties b/spring-rabbit/src/test/resources/log4j-amqp.properties index c577e5b6..df49f277 100644 --- a/spring-rabbit/src/test/resources/log4j-amqp.properties +++ b/spring-rabbit/src/test/resources/log4j-amqp.properties @@ -12,7 +12,7 @@ log4j.appender.amqp.layout=org.apache.log4j.PatternLayout log4j.appender.amqp.layout.ConversionPattern=%d %p %t [%c] - <%m>%n log4j.appender.amqp.generateId=true log4j.appender.amqp.charset=UTF-8 -log4j.appender.amqp.durable=false +log4j.appender.amqp.durable=true log4j.appender.amqp.deliveryMode=NON_PERSISTENT log4j.appender.amqp.declareExchange=true log4j.appender.amqp.clientConnectionProperties=foo:bar,baz:qux