From 304598e4bc0a0efc41796df4a24f9c3b98a83f11 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 3 Jul 2018 13:46:06 +0100
Subject: [PATCH] Upgrade to Artemis 2.6.2

Closes gh-13663
---
 .../jms/artemis/ArtemisEmbeddedConfigurationFactory.java | 2 +-
 spring-boot-project/spring-boot-dependencies/pom.xml     | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java
index ea12be48b28..d232fb31e0e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java
@@ -83,7 +83,7 @@ class ArtemisEmbeddedConfigurationFactory {
 		return new CoreAddressConfiguration().setName(name)
 				.addRoutingType(RoutingType.ANYCAST)
 				.addQueueConfiguration(new CoreQueueConfiguration().setName(name)
-						.setRoutingType(RoutingType.ANYCAST));
+						.setRoutingType(RoutingType.ANYCAST).setAddress(name));
 	}
 
 	private String getDataDir() {
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 5d19a972b83..b9327271d6d 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -36,7 +36,7 @@
 		<activemq.version>5.15.4</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
 		<appengine-sdk.version>1.9.64</appengine-sdk.version>
-		<artemis.version>2.4.0</artemis.version>
+		<artemis.version>2.6.2</artemis.version>
 		<aspectj.version>1.9.0</aspectj.version>
 		<assertj.version>3.9.1</assertj.version>
 		<atomikos.version>4.0.6</atomikos.version>
@@ -1339,7 +1339,12 @@
 			<dependency>
 				<groupId>org.apache.activemq</groupId>
 				<artifactId>artemis-server</artifactId>
-				<version>${artemis.version}</version>
+				<version>${artemis.version}</version><exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.activemq</groupId>