Merge branch '1.5.x'

spring-boot-dependencies/pom.xml

@@ -46,7 +46,7 @@
 		<activemq.version>5.13.4</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
 		<appengine.version>1.9.44</appengine.version>
-		<artemis.version>1.3.0</artemis.version>
+		<artemis.version>1.4.0</artemis.version>
 		<aspectj.version>1.8.9</aspectj.version>
 		<assertj.version>2.5.0</assertj.version>
 		<atomikos.version>3.9.3</atomikos.version>