From f4a3d7ff3abe1b32cac0674f4e45aa4ec21937ce Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:32:52 +0100 Subject: [PATCH 01/40] Upgrade to Couchbase Client 2.7.12 Closes gh-20247 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 1f12035c63..4395e5e623 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -51,7 +51,7 @@ 3.8.1 1.6 2.6.2 - 2.7.11 + 2.7.12 2.1.0 1.0.8.RELEASE 10.14.2.0 From 4b9070d9b5492d09ae9e25706715f5b0bfe30897 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:32:54 +0100 Subject: [PATCH 02/40] Upgrade to Appengine Sdk 1.9.78 Closes gh-20248 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 4395e5e623..b65ecc3eba 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -36,7 +36,7 @@ 5.15.11 2.7.7 - 1.9.77 + 1.9.78 2.6.4 1.9.5 3.11.1 From cd99b838f791a7d9207c5a1a25dd077b0d99e883 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:32:55 +0100 Subject: [PATCH 03/40] Upgrade to Hazelcast 3.11.7 Closes gh-20249 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index b65ecc3eba..6d9052071b 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -69,7 +69,7 @@ 2.8.6 1.4.200 1.3 - 3.11.6 + 3.11.7 1.2.3 5.3.15.Final 6.0.18.Final From b5a20492bdab030aea3644f88e4b7f905cc1bf44 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:32:56 +0100 Subject: [PATCH 04/40] Upgrade to Netty Tcnative 2.0.29.Final Closes gh-20250 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 6d9052071b..3cd02553bd 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -143,7 +143,7 @@ 1.9.22 3.1.16 4.1.45.Final - 2.0.28.Final + 2.0.29.Final 1.1.0 1.0.6 42.2.9 From b3b7d803747ea04b2bbffa98e1e2341e0ffded13 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:32:58 +0100 Subject: [PATCH 05/40] Upgrade to Dependency Management Plugin 1.0.9.RELEASE Closes gh-20251 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 3cd02553bd..e3111aa1c7 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -53,7 +53,7 @@ 2.6.2 2.7.12 2.1.0 - 1.0.8.RELEASE + 1.0.9.RELEASE 10.14.2.0 1.6.1 4.0.7 From 2b033c532bb91dcd8eb0db29921d002988f45474 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:32:59 +0100 Subject: [PATCH 06/40] Upgrade to Httpclient 4.5.11 Closes gh-20252 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index e3111aa1c7..fba5c38315 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -77,7 +77,7 @@ 2.4.1 2.33 4.1.4 - 4.5.10 + 4.5.11 4.4.13 9.4.17.Final 2.14 From ac41bcbb66140017c313a5e1ab8a787efa53b7d2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:01 +0100 Subject: [PATCH 07/40] Upgrade to Tomcat 9.0.31 Closes gh-20253 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- .../boot/web/embedded/tomcat/SslConnectorCustomizerTests.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index fba5c38315..6f8a72d0eb 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -190,7 +190,7 @@ 2.3.0 2.0.1 3.0.4.RELEASE - 9.0.30 + 9.0.31 4.0.14 2.0.29.Final 3325375 diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java index 35c5fc91ec..da7117c8a7 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -153,7 +153,9 @@ public class SslConnectorCustomizerTests { customizer.customize(connector); this.tomcat.start(); SSLHostConfig sslHostConfig = connector.getProtocolHandler().findSslHostConfigs()[0]; + sslHostConfig.getCertificates(true); SSLHostConfig sslHostConfigWithDefaults = new SSLHostConfig(); + sslHostConfigWithDefaults.getCertificates(true); assertThat(sslHostConfig.getTruststoreFile()) .isEqualTo(SslStoreProviderUrlStreamHandlerFactory.TRUST_STORE_URL); assertThat(sslHostConfig.getCertificateKeystoreFile()) From 7b8d3c284de76fee6735d70ac0fd949225ed44e6 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:03 +0100 Subject: [PATCH 08/40] Upgrade to Jetty 9.4.26.v20200117 Closes gh-20254 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 6f8a72d0eb..d3fc8504bc 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -107,7 +107,7 @@ 2.9.3 2.27 6.3.1 - 9.4.25.v20191220 + 9.4.26.v20200117 2.2.0.v201112011158 8.5.49 1.0.3 From 1e5b548501e5b810a961836bd9a46b6dc54bc082 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:04 +0100 Subject: [PATCH 09/40] Upgrade to Infinispan 9.4.18.Final Closes gh-20255 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index d3fc8504bc..7a27634320 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -79,7 +79,7 @@ 4.1.4 4.5.11 4.4.13 - 9.4.17.Final + 9.4.18.Final 2.14 2.9.10.20200103 From 32fdc42ce1f83f88c0706c79e9f11879b1e5b965 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:06 +0100 Subject: [PATCH 10/40] Upgrade to Postgresql 42.2.10 Closes gh-20256 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 7a27634320..807ab268af 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -146,7 +146,7 @@ 2.0.29.Final 1.1.0 1.0.6 - 42.2.9 + 42.2.10 0.5.0 2.3.2 4.2.2 From 3f538c2b4aba60604ee80bcdaf018a461483ccb3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:07 +0100 Subject: [PATCH 11/40] Upgrade to Lombok 1.18.12 Closes gh-20257 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 807ab268af..f07b45e703 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -131,7 +131,7 @@ 3.6.3 2.11.2 1.2.3 - 1.18.10 + 1.18.12 2.3.0 1.1.10 1.9.12 From eecd8e1669fd37ac6d8721189bde1f9c502c62af Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:09 +0100 Subject: [PATCH 12/40] Upgrade to Spring Security 5.1.8.RELEASE Closes gh-20258 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index f07b45e703..3b6a2df7d2 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -178,7 +178,7 @@ 1.2.0.RELEASE 2.0.4.RELEASE 1.2.5.RELEASE - 5.1.7.RELEASE + 5.1.8.RELEASE Bean-SR8 3.0.8.RELEASE 3.25.2 From 29d7714a2bb150f25ccdb6563c886fa3ed66b90c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:10 +0100 Subject: [PATCH 13/40] Upgrade to Spring Session Bom Bean-SR9 Closes gh-20259 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 3b6a2df7d2..47f0a3ec19 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -179,7 +179,7 @@ 2.0.4.RELEASE 1.2.5.RELEASE 5.1.8.RELEASE - Bean-SR8 + Bean-SR9 3.0.8.RELEASE 3.25.2 3.1.0 From fb97f075b916af7281641fd8734bac0b44ae9898 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 13:33:11 +0100 Subject: [PATCH 14/40] Upgrade to Maven Shade Plugin 3.2.2 Closes gh-20260 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 47f0a3ec19..73324a2433 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -217,7 +217,7 @@ 3.1.2 3.0.1 3.1.0 - 3.2.1 + 3.2.2 3.7.1 3.0.1 2.22.2 From 021575a335ca991b2357457622b686aa63c307c2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:24:57 +0100 Subject: [PATCH 15/40] Upgrade to Couchbase Client 2.7.12 Closes gh-20263 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 3d15e6d682..077f618081 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -52,7 +52,7 @@ 3.9 1.6 2.7.0 - 2.7.11 + 2.7.12 2.1.0 1.0.9.RELEASE 11.5.0.0 From 0b1b05f1299cc20e04bb127d9406b90ca5d2b176 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:24:58 +0100 Subject: [PATCH 16/40] Upgrade to Jackson 2.10.2.20200130 Closes gh-20264 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 077f618081..5d3e3d89d2 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -83,7 +83,7 @@ 9.4.17.Final 2.15 - 2.10.2 + 2.10.2.20200130 ${jackson.version} 1.2.1 1.3.5 From 26d30f50194a96a9d61104671126d646d9e2c407 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:00 +0100 Subject: [PATCH 17/40] Upgrade to Caffeine 2.8.1 Closes gh-20265 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 5d3e3d89d2..5fb9fd8d80 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -44,7 +44,7 @@ 4.0.2 2.1.4 1.10.6 - 2.8.0 + 2.8.1 3.7.2 1.5.1 1.13 From e5baa1c55ad5fb4b247650d96ced8ffe333f7046 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:01 +0100 Subject: [PATCH 18/40] Upgrade to Appengine Sdk 1.9.78 Closes gh-20266 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 5fb9fd8d80..9c60b0809f 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -36,7 +36,7 @@ 5.15.11 2.7.7 - 1.9.77 + 1.9.78 2.10.1 1.9.5 3.13.2 From d684277f2954a2388a81d388e5fe223aa397f1f1 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:03 +0100 Subject: [PATCH 19/40] Upgrade to Hazelcast 3.12.6 Closes gh-20267 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 9c60b0809f..0f32a1e41e 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -70,7 +70,7 @@ 2.8.6 1.4.200 2.1 - 3.12.5 + 3.12.6 1.3.2 5.4.10.Final 6.0.18.Final From a7f3b801ae729f3aae51d5e9ead67cf5d82e5d8e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:05 +0100 Subject: [PATCH 20/40] Upgrade to Sendgrid 4.4.5 Closes gh-20268 --- .../sendgrid/SendGridAutoConfigurationTests.java | 6 +++--- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java index aaf91b9a4f..f7e6426895 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,7 +52,7 @@ class SendGridAutoConfigurationTests { void expectedSendGridBeanCreatedApiKey() { loadContext("spring.sendgrid.api-key:SG.SECRET-API-KEY"); SendGrid sendGrid = this.context.getBean(SendGrid.class); - assertThat(sendGrid).extracting("apiKey").isEqualTo("SG.SECRET-API-KEY"); + assertThat(sendGrid.getRequestHeaders().get("Authorization")).isEqualTo("Bearer SG.SECRET-API-KEY"); } @Test @@ -66,7 +66,7 @@ class SendGridAutoConfigurationTests { void autoConfigurationNotFiredWhenBeanAlreadyCreated() { loadContext(ManualSendGridConfiguration.class, "spring.sendgrid.api-key:SG.SECRET-API-KEY"); SendGrid sendGrid = this.context.getBean(SendGrid.class); - assertThat(sendGrid).extracting("apiKey").isEqualTo("SG.CUSTOM_API_KEY"); + assertThat(sendGrid.getRequestHeaders().get("Authorization")).isEqualTo("Bearer SG.CUSTOM_API_KEY"); } @Test diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 0f32a1e41e..98e6111e35 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -180,7 +180,7 @@ 2.2.17 3.141.59 2.36.0 - 4.4.1 + 4.4.5 4.0.1 1.7.30 1.25 From 1858219d1d60608e6398218bf2d9626e56ce3b79 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:06 +0100 Subject: [PATCH 21/40] Upgrade to Jakarta Activation 1.2.2 Closes gh-20269 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 98e6111e35..794019e411 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -85,7 +85,7 @@ 2.10.2.20200130 ${jackson.version} - 1.2.1 + 1.2.2 1.3.5 2.0.3 1.1.6 From 62287739e7590fc2ed8083095f8447f823ca4037 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:08 +0100 Subject: [PATCH 22/40] Upgrade to Lettuce 5.2.2.RELEASE Closes gh-20270 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 794019e411..87f75b548f 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -145,7 +145,7 @@ 2.3.1 1.3.61 1.3.3 - 5.2.1.RELEASE + 5.2.2.RELEASE 3.8.5 2.12.1 1.2.3 From 3c59f08796a62a664db829592ef46a4911845552 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:10 +0100 Subject: [PATCH 23/40] Upgrade to Micrometer 1.3.5 Closes gh-20271 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 87f75b548f..f55e52e02c 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -151,7 +151,7 @@ 1.2.3 1.18.10 2.4.4 - 1.3.3 + 1.3.5 1.9.12 3.1.0 1.12.0 From bcd0a7bbb3a8199342c62a1574c171735ffb328a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:11 +0100 Subject: [PATCH 24/40] Upgrade to Netty Tcnative 2.0.29.Final Closes gh-20272 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index f55e52e02c..4a3419f596 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -161,7 +161,7 @@ 1.9.22 3.2.6 4.1.45.Final - 2.0.28.Final + 2.0.29.Final 1.1.0 19.3.0.0 3.14.6 From 53389ec61b35aa6016ce0d4f4817e2188e983aac Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:12 +0100 Subject: [PATCH 25/40] Upgrade to Rsocket 1.0.0-RC6 Closes gh-20273 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 4a3419f596..1bd73b50de 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -174,7 +174,7 @@ Dysprosium-BUILD-SNAPSHOT 3.3.0 1.0.3 - 1.0.0-RC5 + 1.0.0-RC6 1.3.8 1.2.1 2.2.17 From 15134d92f5cdbde298a5300928d758a9f8faa239 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:14 +0100 Subject: [PATCH 26/40] Upgrade to Byte Buddy 1.10.8 Closes gh-20274 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 1bd73b50de..18543049b9 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -43,7 +43,7 @@ 4.0.6 4.0.2 2.1.4 - 1.10.6 + 1.10.8 2.8.1 3.7.2 1.5.1 From 34479368234e952d335034b1b360ff4918c6a7cb Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:15 +0100 Subject: [PATCH 27/40] Upgrade to Httpclient 4.5.11 Closes gh-20275 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 18543049b9..4e7a5d5215 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -78,7 +78,7 @@ 2.5.0 2.36.0 4.1.4 - 4.5.10 + 4.5.11 4.4.13 9.4.17.Final 2.15 From 1909bac5c85c15668f230fc7288ab520ee9a3b21 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:17 +0100 Subject: [PATCH 28/40] Upgrade to Johnzon Jsonb 1.2.3 Closes gh-20276 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 4e7a5d5215..8fea4db34d 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -133,7 +133,7 @@ 2.10.5 1.6.2 - 1.2.2 + 1.2.3 ${johnzon-jsonb.version} 3.12.3 1.5.0 From 402eb87847664fcfae857b9707f2639d4d8f12f7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:19 +0100 Subject: [PATCH 29/40] Upgrade to Tomcat 9.0.31 Closes gh-20277 --- .../web/embedded/TomcatWebServerFactoryCustomizerTests.java | 3 +++ spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- .../boot/web/embedded/tomcat/SslConnectorCustomizerTests.java | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java index 9e7c12ffcb..d5e4c86ad0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizerTests.java @@ -26,6 +26,7 @@ import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.valves.ErrorReportValve; import org.apache.catalina.valves.RemoteIpValve; import org.apache.coyote.AbstractProtocol; +import org.apache.coyote.ajp.AbstractAjpProtocol; import org.apache.coyote.http11.AbstractHttp11Protocol; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -464,6 +465,8 @@ class TomcatWebServerFactoryCustomizerTests { void ajpConnectorCanBeCustomized() { TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0); factory.setProtocol("AJP/1.3"); + factory.addConnectorCustomizers( + (connector) -> ((AbstractAjpProtocol) connector.getProtocolHandler()).setSecretRequired(false)); this.customizer.customize(factory); WebServer server = factory.getWebServer(); server.start(); diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 8fea4db34d..1cac72a919 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -207,7 +207,7 @@ 2.4.1 2.0.1 3.0.4.RELEASE - 9.0.30 + 9.0.31 4.0.14 2.0.29.Final 3325375 diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java index 0700ce8844..90eef99ab4 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/SslConnectorCustomizerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -152,7 +152,9 @@ class SslConnectorCustomizerTests { customizer.customize(connector); this.tomcat.start(); SSLHostConfig sslHostConfig = connector.getProtocolHandler().findSslHostConfigs()[0]; + sslHostConfig.getCertificates(true); SSLHostConfig sslHostConfigWithDefaults = new SSLHostConfig(); + sslHostConfigWithDefaults.getCertificates(true); assertThat(sslHostConfig.getTruststoreFile()) .isEqualTo(SslStoreProviderUrlStreamHandlerFactory.TRUST_STORE_URL); assertThat(sslHostConfig.getCertificateKeystoreFile()) From a99f7910bcc2cbed79a9a79176de7add4f0e109a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:20 +0100 Subject: [PATCH 30/40] Upgrade to Jetty 9.4.26.v20200117 Closes gh-20278 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 1cac72a919..06dc49dfdb 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -124,7 +124,7 @@ 3.1.0 2.29.1 6.3.1 - 9.4.25.v20191220 + 9.4.26.v20200117 2.2.0.v201112011158 8.5.49 1.0.3 From 7b389f04ad6da1d7b5803b7b47ecf0cd7356b289 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:21 +0100 Subject: [PATCH 31/40] Upgrade to Hibernate 5.4.12.Final Closes gh-20279 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 06dc49dfdb..05c719bb8a 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -72,7 +72,7 @@ 2.1 3.12.6 1.3.2 - 5.4.10.Final + 5.4.12.Final 6.0.18.Final 3.4.2 2.5.0 From e56a4dfc87d7188731c675a151b213e4d5c6d413 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:23 +0100 Subject: [PATCH 32/40] Upgrade to Infinispan 9.4.18.Final Closes gh-20280 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 05c719bb8a..ece666a17e 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -80,7 +80,7 @@ 4.1.4 4.5.11 4.4.13 - 9.4.17.Final + 9.4.18.Final 2.15 2.10.2.20200130 From 4b3273440fdaf936710862caccb9fb31598e3878 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:24 +0100 Subject: [PATCH 33/40] Upgrade to Jooq 3.12.4 Closes gh-20281 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index ece666a17e..f1dfb12126 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -135,7 +135,7 @@ 1.2.3 ${johnzon-jsonb.version} - 3.12.3 + 3.12.4 1.5.0 2.4.0 1.2 From 85139c0321ed172ebdca12effb67f1458b3bf183 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:26 +0100 Subject: [PATCH 34/40] Upgrade to Liquibase 3.8.6 Closes gh-20282 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index f1dfb12126..ccd13fd21c 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -146,7 +146,7 @@ 1.3.61 1.3.3 5.2.2.RELEASE - 3.8.5 + 3.8.6 2.12.1 1.2.3 1.18.10 From 6a3a32460f14ce0ebdc822b454575ebd861c9926 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:28 +0100 Subject: [PATCH 35/40] Upgrade to Neo4j Ogm 3.2.8 Closes gh-20283 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index ccd13fd21c..cc4d6ef758 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -159,7 +159,7 @@ 7.4.1.jre8 8.0.19 1.9.22 - 3.2.6 + 3.2.8 4.1.45.Final 2.0.29.Final 1.1.0 From fb0d14baa8b4edefbbe4f328ff00feaa14b45a95 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:29 +0100 Subject: [PATCH 36/40] Upgrade to Postgresql 42.2.10 Closes gh-20284 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index cc4d6ef758..d698ffcc55 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -166,7 +166,7 @@ 19.3.0.0 3.14.6 1.0.6 - 42.2.9 + 42.2.10 0.7.0 2.3.2 4.2.2 From 412aee65ea0ab426d6b1625a61959c0b04f67efc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:31 +0100 Subject: [PATCH 37/40] Upgrade to Lombok 1.18.12 Closes gh-20285 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index d698ffcc55..6ab589a42a 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -149,7 +149,7 @@ 3.8.6 2.12.1 1.2.3 - 1.18.10 + 1.18.12 2.4.4 1.3.5 1.9.12 From a3d4367ccc2f1256f8900405acf29ac47a7c5410 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:32 +0100 Subject: [PATCH 38/40] Upgrade to Spring Security 5.2.2.RELEASE Closes gh-20286 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 6ab589a42a..3a405d4580 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -196,7 +196,7 @@ 2.3.2.RELEASE 2.0.4.RELEASE 1.2.5.RELEASE - 5.2.1.RELEASE + 5.2.2.RELEASE Corn-RELEASE 3.0.8.RELEASE 3.28.0 From 4a64426218c9381c14a3b4dd1d1cdcf8906ed232 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:34 +0100 Subject: [PATCH 39/40] Upgrade to Spring Session Bom Corn-SR1 Closes gh-20287 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 3a405d4580..d69574d9cd 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -197,7 +197,7 @@ 2.0.4.RELEASE 1.2.5.RELEASE 5.2.2.RELEASE - Corn-RELEASE + Corn-SR1 3.0.8.RELEASE 3.28.0 ${jakarta-mail.version} From 3f0a5a5482c11b82547dd9486b26896f84fc7253 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 21 Feb 2020 14:25:35 +0100 Subject: [PATCH 40/40] Upgrade to Maven Shade Plugin 3.2.2 Closes gh-20288 --- spring-boot-project/spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index d69574d9cd..334bd2a54a 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -232,7 +232,7 @@ 3.1.2 3.1.1 3.1.0 - 3.2.1 + 3.2.2 3.8.2 3.1.0 2.22.2