Merge branch '1.4.x' into 1.5.x

spring-boot-cli/samples/jms.groovy

@@ -1,9 +1,8 @@
 package org.test
 
-@Grab("spring-boot-starter-hornetq")
-@Grab("hornetq-jms-server")
+@Grab("spring-boot-starter-artemis")
+@Grab("artemis-jms-server")
 import java.util.concurrent.CountDownLatch
-import org.hornetq.jms.server.config.impl.JMSQueueConfigurationImpl
 
 @Log
 @Configuration
@@ -17,7 +16,7 @@ class JmsExample implements CommandLineRunner {
 
 	void run(String... args) {
 		def messageCreator = { session ->
-			session.createObjectMessage("Greetings from Spring Boot via HornetQ")
+			session.createObjectMessage("Greetings from Spring Boot via Artemis")
 		} as MessageCreator
 		log.info "Sending JMS message..."
 		jmsTemplate.send("spring-boot", messageCreator)
@@ -31,8 +30,4 @@ class JmsExample implements CommandLineRunner {
 		latch.countDown()
 	}
 
-	@Bean JMSQueueConfigurationImpl springBootQueue() {
-		new  JMSQueueConfigurationImpl('spring-boot', null, false)
-	}
-
 }

spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java

@@ -145,7 +145,7 @@ public class SampleIntegrationTests {
 	@Test
 	public void jmsSample() throws Exception {
 		String output = this.cli.run("jms.groovy");
-		assertThat(output).contains("Received Greetings from Spring Boot via HornetQ");
+		assertThat(output).contains("Received Greetings from Spring Boot via Artemis");
 	}
 
 	@Test

spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml

@@ -33,11 +33,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-hornetq</artifactId>
+			<artifactId>spring-boot-starter-artemis</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hornetq</groupId>
-			<artifactId>hornetq-jms-server</artifactId>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>artemis-jms-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>

spring-boot-samples/spring-boot-sample-jta-atomikos/src/main/resources/application.properties

@@ -1,5 +1 @@
-spring.hornetq.mode=embedded
-spring.hornetq.embedded.enabled=true
-spring.hornetq.embedded.queues=accounts
-
-logging.level.com.atomikos=WARN
+logging.level.com.atomikos=WARN

spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml

@@ -33,11 +33,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-hornetq</artifactId>
+			<artifactId>spring-boot-starter-artemis</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hornetq</groupId>
-			<artifactId>hornetq-jms-server</artifactId>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>artemis-jms-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>

spring-boot-samples/spring-boot-sample-jta-bitronix/src/main/resources/application.properties

@@ -1,3 +0,0 @@
-spring.hornetq.mode=embedded
-spring.hornetq.embedded.enabled=true
-spring.hornetq.embedded.queues=accounts

spring-boot-samples/spring-boot-sample-jta-narayana/pom.xml

@@ -28,11 +28,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-hornetq</artifactId>
+			<artifactId>spring-boot-starter-artemis</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hornetq</groupId>
-			<artifactId>hornetq-jms-server</artifactId>
+			<groupId>org.apache.activemq</groupId>
+			<artifactId>artemis-jms-server</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>

spring-boot-samples/spring-boot-sample-jta-narayana/src/main/resources/application.properties

@@ -1,5 +1 @@
-spring.hornetq.mode=embedded
-spring.hornetq.embedded.enabled=true
-spring.hornetq.embedded.queues=accounts
-
 logging.level.com.arjuna=INFO