From ac4c29bc9f0db7df037678902a3d84c0f32bd68e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Jan 2017 20:29:24 +0000 Subject: [PATCH 1/6] Upgrade to Hazelcast 3.7.5 Closes gh-8093 --- 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 ce7017c55a..1f34dd54fe 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -84,7 +84,7 @@ 2.8.0 1.4.193 1.3 - 3.7.4 + 3.7.5 3.7.1 1.1.3 5.0.11.Final From 31f1ad9bb915b4430d94efafb9935ac4d1d7f199 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Jan 2017 20:29:25 +0000 Subject: [PATCH 2/6] Upgrade to Artemis 1.5.2 Closes gh-8094 --- 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 1f34dd54fe..9111b593d0 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -49,7 +49,7 @@ 5.14.3 2.7.7 1.9.48 - 1.5.1 + 1.5.2 1.8.9 2.6.0 3.9.3 From e42ae87989ad7d53daa4668a1ce6cd401c36db6d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Jan 2017 20:29:25 +0000 Subject: [PATCH 3/6] Upgrade to Jersey 2.25.1 Closes gh-8095 --- 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 9111b593d0..e1bdc7c906 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -110,7 +110,7 @@ 7.5.0.Final 2.0.6 2.9.0 - 2.25 + 2.25.1 2.0.4 9.4.1.v20170120 2.2.0.v201112011158 From 99a48a9a8c18d2e0916f772c83716ede36feef99 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Jan 2017 20:29:26 +0000 Subject: [PATCH 4/6] Upgrade to Narayana 5.5.1.Final Closes gh-8096 --- spring-boot-dependencies/pom.xml | 2 +- .../boot/jta/narayana/NarayanaDataSourceBeanTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index e1bdc7c906..ed87816cb6 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -136,7 +136,7 @@ 1.10.19 3.4.1 5.1.40 - 5.5.0.Final + 5.5.1.Final 1.9.22 2.1.1 9.4.1212.jre7 diff --git a/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java index fada25acca..b6b59dd6bb 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java @@ -83,7 +83,7 @@ public class NarayanaDataSourceBeanTests { Connection mockConnection = mock(Connection.class); XAConnection mockXaConnection = mock(XAConnection.class); given(mockXaConnection.getConnection()).willReturn(mockConnection); - given(this.dataSource.getXAConnection()).willReturn(mockXaConnection); + given(this.dataSource.getXAConnection("", "")).willReturn(mockXaConnection); Properties properties = new Properties(); properties.put(TransactionalDriver.XADataSource, this.dataSource); @@ -93,7 +93,7 @@ public class NarayanaDataSourceBeanTests { connection.commit(); - verify(this.dataSource, times(1)).getXAConnection(); + verify(this.dataSource, times(1)).getXAConnection("", ""); verify(mockXaConnection, times(1)).getConnection(); verify(mockConnection, times(1)).commit(); } From 7ae9148caaf178dbdf698bb48f259dc2f755200d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Jan 2017 20:29:27 +0000 Subject: [PATCH 5/6] Upgrade to Jooq 3.9.1 Closes gh-8097 --- 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 ed87816cb6..1a4a0deb40 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -120,7 +120,7 @@ 4.2.2 2.9.7 1.3.5 - 3.9.0 + 3.9.1 20140107 1.4.0 2.2.0 From 5ee46742be91192088492b443d02c699f8502fa6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 24 Jan 2017 20:29:27 +0000 Subject: [PATCH 6/6] Upgrade to Mariadb 1.5.7 Closes gh-8098 --- 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 1a4a0deb40..ab64d3f9d9 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -131,7 +131,7 @@ 2.7 1.1.9 1.16.12 - 1.5.6 + 1.5.7 6.1.0.jre7 1.10.19 3.4.1