Merge branch '1.5.x'

Author: wilkinsona

spring-boot-dependencies/pom.xml

@@ -46,7 +46,7 @@
 	</developers>
 	<properties>
 		<!-- Dependency versions -->
-		<activemq.version>5.14.4</activemq.version>
+		<activemq.version>5.14.5</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
 		<appengine-sdk.version>1.9.51</appengine-sdk.version>
 		<artemis.version>1.5.4</artemis.version>
@@ -71,7 +71,7 @@
 		<derby.version>10.13.1.1</derby.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<dropwizard-metrics.version>3.1.4</dropwizard-metrics.version>
-		<ehcache.version>2.10.3</ehcache.version>
+		<ehcache.version>2.10.4</ehcache.version>
 		<ehcache3.version>3.2.2</ehcache3.version>
 		<embedded-mongo.version>2.0.0</embedded-mongo.version>
 		<flyway.version>4.1.2</flyway.version>
@@ -102,14 +102,14 @@
 		<javax-transaction.version>1.2</javax-transaction.version>
 		<javax-validation.version>1.1.0.Final</javax-validation.version>
 		<jaxen.version>1.1.6</jaxen.version>
-		<jaybird.version>2.2.12</jaybird.version>
+		<jaybird.version>2.2.13</jaybird.version>
 		<jboss-logging.version>3.3.1.Final</jboss-logging.version>
 		<jboss-transaction-spi.version>7.5.2.Final</jboss-transaction-spi.version>
 		<jdom2.version>2.0.6</jdom2.version>
 		<jedis.version>2.9.0</jedis.version>
 		<jersey.version>2.25.1</jersey.version>
 		<jest.version>2.0.4</jest.version>
-		<jetty.version>9.4.3.v20170317</jetty.version>
+		<jetty.version>9.4.4.v20170414</jetty.version>
 		<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
 		<jetty-el.version>8.0.33</jetty-el.version>
 		<jmustache.version>1.13</jmustache.version>
@@ -134,7 +134,7 @@
 		<mongo-driver-reactivestreams.version>1.3.0</mongo-driver-reactivestreams.version>
 		<mongodb.version>3.4.2</mongodb.version>
 		<mysql.version>5.1.41</mysql.version>
-		<narayana.version>5.5.6.Final</narayana.version>
+		<narayana.version>5.5.7.Final</narayana.version>
 		<nekohtml.version>1.9.22</nekohtml.version>
 		<neo4j-ogm.version>3.0.0-SNAPSHOT</neo4j-ogm.version>
 		<netty.version>4.1.9.Final</netty.version>
@@ -185,8 +185,8 @@
 		<thymeleaf-layout-dialect.version>2.1.2</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
 		<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
-		<tomcat.version>8.5.13</tomcat.version>
-		<undertow.version>1.4.12.Final</undertow.version>
+		<tomcat.version>8.5.14</tomcat.version>
+		<undertow.version>1.4.13.Final</undertow.version>
 		<unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version>
 		<webjars-hal-browser.version>3325375</webjars-hal-browser.version>
 		<webjars-locator.version>0.32-1</webjars-locator.version>