Merge branch '1.3.x'

Author: snicoll

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
  */
 class ArtemisConnectionFactoryFactory {
 
-	static final String EMBEDDED_JMS_CLASS = "org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ";
+	static final String EMBEDDED_JMS_CLASS = "org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS";
 
 	private final ArtemisProperties properties;
 

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -3625,7 +3625,9 @@ resolved against their provided names.
 Apache Artemis was formed in 2015 when HornetQ was donated to the Apache Foundation. All
 the features listed in the <<boot-features-hornetq>> section below can be applied to
 Artemis. Simply replace `+++spring.hornetq.*+++` properties with `+++spring.artemis.*+++`
-and use `spring-boot-starter-artemis` instead of `spring-boot-starter-hornetq`.
+and use `spring-boot-starter-artemis` instead of `spring-boot-starter-hornetq`. If you
+want to embed Artemis, make sure to add `org.apache.activemq:artemis-jms-server` to the
+dependencies of your application.
 
 NOTE: You should not try and use Artemis and HornetQ and the same time.