Merge branch '1.4.x' into 1.5.x

2016-09-29 13:12:11 +01:00
parent 323c749352 1bb5dc205d
commit cd45ce9104
8 changed files with 14 additions and 30 deletions
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
+++ b/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