Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml

spring-boot-dependencies/pom.xml

@@ -47,7 +47,7 @@
 		<spring-boot.version>1.2.0.BUILD-SNAPSHOT</spring-boot.version>
 		<!-- Third Party -->
 		<activemq.version>5.10.0</activemq.version>
-		<aspectj.version>1.8.2</aspectj.version>
+		<aspectj.version>1.8.4</aspectj.version>
 		<atomikos.version>3.9.3</atomikos.version>
 		<bitronix.version>2.1.4</bitronix.version>
 		<commons-beanutils.version>1.9.2</commons-beanutils.version>
@@ -60,20 +60,20 @@
 		<crashub.version>1.3.0</crashub.version>
 		<dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
 		<flyway.version>3.0</flyway.version>
-		<freemarker.version>2.3.20</freemarker.version>
+		<freemarker.version>2.3.21</freemarker.version>
 		<gemfire.version>7.0.2</gemfire.version>
 		<gradle.version>1.6</gradle.version>
-		<groovy.version>2.3.6</groovy.version>
+		<groovy.version>2.3.7</groovy.version>
 		<h2.version>1.3.176</h2.version>
 		<hamcrest.version>1.3</hamcrest.version>
-		<hibernate.version>4.3.6.Final</hibernate.version>
+		<hibernate.version>4.3.7.Final</hibernate.version>
 		<hibernate-entitymanager.version>${hibernate.version}</hibernate-entitymanager.version>
 		<hibernate-jpa-api.version>1.0.1.Final</hibernate-jpa-api.version>
 		<hibernate-validator.version>5.1.2.Final</hibernate-validator.version>
 		<hikaricp.version>2.1.0</hikaricp.version>
-		<httpclient.version>4.3.5</httpclient.version>
+		<httpclient.version>4.3.6</httpclient.version>
 		<httpasyncclient.version>4.0.2</httpasyncclient.version>
-		<hornetq.version>2.4.3.Final</hornetq.version>
+		<hornetq.version>2.4.5.Final</hornetq.version>
 		<hsqldb.version>2.3.2</hsqldb.version>
 		<jackson.version>2.4.2</jackson.version>
 		<gson.version>2.3</gson.version>
@@ -88,7 +88,7 @@
 		<jdom2.version>2.0.5</jdom2.version>
 		<jersey.version>2.13</jersey.version>
 		<joda-time.version>2.4</joda-time.version>
-		<jolokia.version>1.2.2</jolokia.version>
+		<jolokia.version>1.2.3</jolokia.version>
 		<json-path.version>0.9.1</json-path.version>
 		<jstl.version>1.2</jstl.version>
 		<junit.version>4.11</junit.version>
@@ -97,8 +97,8 @@
 		<log4j2.version>2.0.2</log4j2.version>
 		<logback.version>1.1.2</logback.version>
 		<mockito.version>1.9.5</mockito.version>
-		<mongodb.version>2.12.3</mongodb.version>
-		<mysql.version>5.1.32</mysql.version>
+		<mongodb.version>2.12.4</mongodb.version>
+		<mysql.version>5.1.34</mysql.version>
 		<reactor.version>1.1.5.RELEASE</reactor.version>
 		<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
 		<servlet-api.version>3.1.0</servlet-api.version>
@@ -125,7 +125,7 @@
 		<sun-mail.version>${javax-mail.version}</sun-mail.version>
 		<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
 		<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
-		<thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
+		<thymeleaf-layout-dialect.version>1.2.7</thymeleaf-layout-dialect.version>
 		<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
 		<tomcat.version>8.0.14</tomcat.version>
 		<velocity.version>1.7</velocity.version>

spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java

@@ -16,6 +16,8 @@
 
 package sample.data.mongo;
 
+import java.util.regex.Pattern;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.springframework.boot.test.OutputCapture;
@@ -33,6 +35,9 @@ import static org.junit.Assert.assertTrue;
  */
 public class SampleMongoApplicationTests {
 
+	private static final Pattern TIMEOUT_MESSAGE_PATTERN = Pattern
+			.compile("Timed out after [0-9]+ ms while waiting for a server.*");
+
 	@Rule
 	public OutputCapture outputCapture = new OutputCapture();
 
@@ -61,7 +66,7 @@ public class SampleMongoApplicationTests {
 			if (root.getMessage().contains("Unable to connect to any server")) {
 				return true;
 			}
-			if (root.getMessage().contains("Timed out while waiting for a server")) {
+			if (TIMEOUT_MESSAGE_PATTERN.matcher(root.getMessage()).matches()) {
 				return true;
 			}
 		}