From 48ba1d888fe4f5e09f8d9fdf9a061b718d5f0c73 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 2 Oct 2015 13:04:26 -0400
Subject: [PATCH 1/2] Update Spring AMQP to 1.4.6

---
 spring-boot-dependencies/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 029d4a19561..8b798fbe4b7 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -112,7 +112,7 @@
 		<solr.version>4.7.2</solr.version>
 		<spock.version>0.7-groovy-2.0</spock.version>
 		<spring.version>4.1.7.RELEASE</spring.version>
-		<spring-amqp.version>1.4.5.RELEASE</spring-amqp.version>
+		<spring-amqp.version>1.4.6.RELEASE</spring-amqp.version>
 		<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
 		<spring-batch.version>3.0.5.RELEASE</spring-batch.version>
 		<spring-data-releasetrain.version>Evans-SR3</spring-data-releasetrain.version>
@@ -1686,4 +1686,4 @@
 			<id>integration-test</id>
 		</profile>
 	</profiles>
-</project>
\ No newline at end of file
+</project>

From 891faa9d354ee730b7a850849ebd3efd68eea746 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 2 Oct 2015 15:04:04 -0700
Subject: [PATCH 2/2] Fix test cleanup to reset commons logging

---
 .../logging/AutoConfigurationReportLoggingInitializerTests.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
index a8d3f727c4c..4c3b24bf848 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
@@ -105,7 +105,7 @@ public class AutoConfigurationReportLoggingInitializerTests {
 
 	@After
 	public void cleanup() {
-		System.clearProperty(LogFactory.FACTORY_PROPERTIES);
+		System.clearProperty(LogFactory.FACTORY_PROPERTY);
 		LogFactory.releaseAll();
 	}