Merge branch '2.0.x'

2018-04-26 16:45:03 +02:00
parent 25414d1b58 fbe88c483e
commit 11d583ab46
1 changed files with 6 additions and 0 deletions
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -2520,6 +2520,12 @@
 				<groupId>org.springframework.amqp</groupId>
 				<artifactId>spring-rabbit</artifactId>
 				<version>${spring-amqp.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.rabbitmq</groupId>
+						<artifactId>http-client</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.amqp</groupId>