From 9b6ff220a1e2c56964131bc021f414a23aca7d67 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:03:29 +0000 Subject: [PATCH 01/10] Upgrade to MySQL Connector 5.1.34 Closes gh-1875 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 5d2c390659..6be8ebcbd1 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -90,7 +90,7 @@ 1.1.2 1.9.5 2.12.3 - 5.1.32 + 5.1.34 1.1.5.RELEASE 1.1.3.RELEASE 3.0.1 From 38e8942696f2224dd38ff24630559607e9b02a45 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:04:10 +0000 Subject: [PATCH 02/10] Upgrade to Thymeleaf Layout Dialect 1.2.7 Closes gh-1876 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 6be8ebcbd1..769745a399 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -115,7 +115,7 @@ 2.2.0.RELEASE 2.1.3.RELEASE 2.1.1.RELEASE - 1.2.5 + 1.2.7 7.0.56 1.7 2.0 From a250e60a3ef3098b27ed10036c06074b3f62179b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:04:59 +0000 Subject: [PATCH 03/10] Upgrade to Apache HTTPClient 4.3.6 Closes gh-1877 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 769745a399..e957c1e777 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -68,7 +68,7 @@ 1.0.1.Final 5.0.3.Final 1.4.0 - 4.3.5 + 4.3.6 4.0.2 2.4.3.Final 2.3.2 From 3647e1b0cad6bbf059b5db960084390c382bfdf5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:06:57 +0000 Subject: [PATCH 04/10] Upgrade to AspectJ 1.8.4 Closes gh-1878 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e957c1e777..e37e79333d 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -47,7 +47,7 @@ 1.1.9.BUILD-SNAPSHOT 5.9.1 - 1.8.2 + 1.8.4 3.0.2 1.9.2 3.2.1 From effbfb6d14e253e6767e782fe17609c8dbd0c089 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:07:21 +0000 Subject: [PATCH 05/10] Upgrade to Groovy 2.3.7 Closes gh-1879 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e37e79333d..e7c12a07ac 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -60,7 +60,7 @@ 2.3.20 7.0.2 1.6 - 2.3.6 + 2.3.7 1.3.176 1.3 4.3.6.Final From 55f976dd6b2bef0a5794edff1f915d9f06db1f66 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:07:49 +0000 Subject: [PATCH 06/10] Upgrade to Freemarker 2.3.21 Closes gh-1880 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e7c12a07ac..f343455e84 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -57,7 +57,7 @@ 2.2 1.3.0 3.0 - 2.3.20 + 2.3.21 7.0.2 1.6 2.3.7 From 4e9da8c86eb98e771a2ec691a98fe8b63df3b988 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:08:09 +0000 Subject: [PATCH 07/10] Upgrade to Hibernate 4.3.7 Closes gh-1881 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index f343455e84..f8d36a6707 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -63,7 +63,7 @@ 2.3.7 1.3.176 1.3 - 4.3.6.Final + 4.3.7.Final ${hibernate.version} 1.0.1.Final 5.0.3.Final From a09e8f7538892942bde1697ef9df74580f11dfeb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:08:37 +0000 Subject: [PATCH 08/10] Upgrade to HornetQ 2.4.5 Closes gh-1882 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index f8d36a6707..b5af594ebf 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -70,7 +70,7 @@ 1.4.0 4.3.6 4.0.2 - 2.4.3.Final + 2.4.5.Final 2.3.2 2.3.4 2.6.1 From 7e95dba52e0d5f3862fd5d7a9e1d9dfce87e93df Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:08:58 +0000 Subject: [PATCH 09/10] Upgrade to Jolokia 1.2.3 Closes gh-1883 --- spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index b5af594ebf..9f2c5fbfad 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -81,7 +81,7 @@ 1.1.6 2.0.5 2.3 - 1.2.2 + 1.2.3 0.9.1 1.2 4.11 From f07c09087665cded10ff2eb222a06d539467d24d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Nov 2014 10:10:16 +0000 Subject: [PATCH 10/10] Upgrade to Mongo Java Driver 2.12.4 The exception message for a connection timeout has been updated to include the timeout period. The tests for the sample have been updated accordingly. Closes gh-1884 --- spring-boot-dependencies/pom.xml | 2 +- .../sample/data/mongo/SampleMongoApplicationTests.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 9f2c5fbfad..8a19468f1c 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -89,7 +89,7 @@ 1.2.17 1.1.2 1.9.5 - 2.12.3 + 2.12.4 5.1.34 1.1.5.RELEASE 1.1.3.RELEASE diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java index d349ae3d38..a548beeecc 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java +++ b/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; } }