From b25e2221360666a3ccaa0f2e234c049769b6983f Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 15 Oct 2018 14:12:12 -0700
Subject: [PATCH 1/2] Retain original case when mapping endpoint paths

Update `MappingWebEndpointPathMapper` to keep the original case rather
than using a lower-case version.

Closes gh-14773
---
 .../endpoint/web/MappingWebEndpointPathMapper.java              | 2 +-
 .../endpoint/web/MappingWebEndpointPathMapperTests.java         | 2 +-
 .../springframework/boot/actuate/endpoint/web/PathMapper.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java
index 9bed06f81b6..c9757dd1175 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapper.java
@@ -46,7 +46,7 @@ class MappingWebEndpointPathMapper implements PathMapper {
 
 	@Override
 	public String getRootPath(EndpointId endpointId) {
-		return this.pathMapping.getOrDefault(endpointId, endpointId.toLowerCaseString());
+		return this.pathMapping.getOrDefault(endpointId, endpointId.toString());
 	}
 
 }
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java
index d9d1d0aa924..432d9cd8497 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/MappingWebEndpointPathMapperTests.java
@@ -50,7 +50,7 @@ public class MappingWebEndpointPathMapperTests {
 		MappingWebEndpointPathMapper mapper = new MappingWebEndpointPathMapper(
 				Collections.emptyMap());
 		assertThat(mapper.getRootPath(EndpointId.of("testEndpoint")))
-				.isEqualTo("testendpoint");
+				.isEqualTo("testEndpoint");
 	}
 
 	@Test
diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java
index 12af95b1fd5..64c874b0f89 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/web/PathMapper.java
@@ -63,7 +63,7 @@ public interface PathMapper {
 
 			@Override
 			public String getRootPath(EndpointId endpointId) {
-				return endpointId.toLowerCaseString();
+				return endpointId.toString();
 			}
 
 		};

From 192340c5ee35234c302dc8b1c189d95d1a9ef6d7 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 15 Oct 2018 14:14:12 -0700
Subject: [PATCH 2/2] Upgrade to Spring AMQP 2.0.8.RELEASE

Closes gh-14833
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 27779a4472e..8b1e5edfb16 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -154,7 +154,7 @@
 		<snakeyaml.version>1.19</snakeyaml.version>
 		<solr.version>6.6.5</solr.version>
 		<spring.version>5.0.10.RELEASE</spring.version>
-		<spring-amqp.version>2.0.6.RELEASE</spring-amqp.version>
+		<spring-amqp.version>2.0.8.RELEASE</spring-amqp.version>
 		<spring-batch.version>4.0.1.RELEASE</spring-batch.version>
 		<spring-cloud-connectors.version>2.0.3.RELEASE</spring-cloud-connectors.version>
 		<spring-data-releasetrain.version>Kay-SR11</spring-data-releasetrain.version>