From e648f5ce6cf46193be6bc509deae9aac11633377 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:47:16 +0100 Subject: [PATCH 01/27] Switch Bomr's upgrade policy to same minor version --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b86d979133..16b5876676 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -8,7 +8,7 @@ description = "Spring Boot Dependencies" bom { upgrade { - policy = "same-major-version" + policy = "same-minor-version" gitHub { issueLabels = ["type: dependency-upgrade"] } From ed038e6adeab33304ad7964bdd59e82a8cb19ba1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:28 +0100 Subject: [PATCH 02/27] Upgrade to Awaitility 4.0.3 Closes gh-21840 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 16b5876676..b06f24e625 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -117,7 +117,7 @@ bom { ] } } - library("Awaitility", "4.0.2") { + library("Awaitility", "4.0.3") { group("org.awaitility") { modules = [ "awaitility", From 306ddf7d16155a6195390f8234fe3d14a3939de3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:29 +0100 Subject: [PATCH 03/27] Upgrade to Byte Buddy 1.10.11 Closes gh-21841 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b06f24e625..4ebf4e3036 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -141,7 +141,7 @@ bom { ] } } - library("Byte Buddy", "1.10.10") { + library("Byte Buddy", "1.10.11") { group("net.bytebuddy") { modules = [ "byte-buddy", From c1e8f8626d2a7bf1911a0cb4b701b2444e14c9b3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:31 +0100 Subject: [PATCH 04/27] Upgrade to Caffeine 2.8.4 Closes gh-21842 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 4ebf4e3036..40e737d3bb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -149,7 +149,7 @@ bom { ] } } - library("Caffeine", "2.8.2") { + library("Caffeine", "2.8.4") { group("com.github.ben-manes.caffeine") { modules = [ "caffeine", From 5d8d2fe1465df59ebbecc3fc177027ca65c5d281 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:32 +0100 Subject: [PATCH 05/27] Upgrade to Couchbase Client 3.0.5 Closes gh-21843 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 40e737d3bb..fd1fd692ce 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -215,7 +215,7 @@ bom { ] } } - library("Couchbase Client", "3.0.4") { + library("Couchbase Client", "3.0.5") { group("com.couchbase.client") { modules = [ "java-client" From cfd5cb5496f384a25dc6f4c18ef92d49afa5f3b6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:34 +0100 Subject: [PATCH 06/27] Upgrade to Dropwizard Metrics 4.1.9 Closes gh-21844 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index fd1fd692ce..e8b2ed6f76 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -247,7 +247,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.1.7") { + library("Dropwizard Metrics", "4.1.9") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From c26c52d82b81f639db1b628e2994743f9e1e33d0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:35 +0100 Subject: [PATCH 07/27] Upgrade to Flyway 6.4.4 Closes gh-21845 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index e8b2ed6f76..98a44e8253 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -317,7 +317,7 @@ bom { ] } } - library("Flyway", "6.4.1") { + library("Flyway", "6.4.4") { group("org.flywaydb") { modules = [ "flyway-core" From 2fef9629c531bcf96955ebd7644266c5de1f63bb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:36 +0100 Subject: [PATCH 08/27] Upgrade to Groovy 2.5.12 Closes gh-21846 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 98a44e8253..806d93634e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -362,7 +362,7 @@ bom { ] } } - library("Groovy", "2.5.11") { + library("Groovy", "2.5.12") { group("org.codehaus.groovy") { modules = [ "groovy", From d7913ff1a85cddf9fcaac81aed16f72bd4c0c5b3 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:37 +0100 Subject: [PATCH 09/27] Upgrade to Hibernate 5.4.17.Final Closes gh-21847 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 806d93634e..a53268039e 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -435,7 +435,7 @@ bom { ] } } - library("Hibernate", "5.4.15.Final") { + library("Hibernate", "5.4.17.Final") { group("org.hibernate") { modules = [ "hibernate-c3p0", From 1424ac406c4d536fdad2f1fd16eb8d837397c5f6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:39 +0100 Subject: [PATCH 10/27] Upgrade to Jaybird 3.0.9 Closes gh-21848 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a53268039e..a3e9d2bfe5 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -811,7 +811,7 @@ bom { ] } } - library("Jaybird", "3.0.8") { + library("Jaybird", "3.0.9") { group("org.firebirdsql.jdbc") { modules = [ "jaybird-jdk17", From 30355f38be7547111c6dfa501d0d2b8cde94a8de Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:40 +0100 Subject: [PATCH 11/27] Upgrade to Jetty Reactive HTTPClient 1.1.3 Closes gh-21849 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a3e9d2bfe5..cd63f31c1a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -868,7 +868,7 @@ bom { ] } } - library("Jetty Reactive HTTPClient", "1.1.2") { + library("Jetty Reactive HTTPClient", "1.1.3") { group("org.eclipse.jetty") { modules = [ "jetty-reactive-httpclient" From ce8554211e1aadc1ca180cb69e78750c75e8e6fa Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:42 +0100 Subject: [PATCH 12/27] Upgrade to Jetty 9.4.29.v20200521 Closes gh-21850 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index cd63f31c1a..d4eec0a330 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -875,7 +875,7 @@ bom { ] } } - library("Jetty", "9.4.28.v20200408") { + library("Jetty", "9.4.29.v20200521") { group("org.eclipse.jetty") { imports = [ "jetty-bom" From 8687533e34af626994c74c415a76606cd00cbe92 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:43 +0100 Subject: [PATCH 13/27] Upgrade to Johnzon 1.2.7 Closes gh-21851 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d4eec0a330..cce0c79acb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -889,7 +889,7 @@ bom { ] } } - library("Johnzon", "1.2.5") { + library("Johnzon", "1.2.7") { group("org.apache.johnzon") { modules = [ "johnzon-core", From 08f37b348980062ef8991ed654e0732d3d8aa43c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:44 +0100 Subject: [PATCH 14/27] Upgrade to Kotlin Coroutines 1.3.7 Closes gh-21852 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index cce0c79acb..541698618a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -998,7 +998,7 @@ bom { ] } } - library("Kotlin Coroutines", "1.3.6") { + library("Kotlin Coroutines", "1.3.7") { group("org.jetbrains.kotlinx") { imports = [ "kotlinx-coroutines-bom" From 39c25ff1c4a9ee7f6d06e978e69c55e4dd8cc6b4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:45 +0100 Subject: [PATCH 15/27] Upgrade to Lettuce 5.3.1.RELEASE Closes gh-21853 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 541698618a..d0c0393353 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1005,7 +1005,7 @@ bom { ] } } - library("Lettuce", "5.3.0.RELEASE") { + library("Lettuce", "5.3.1.RELEASE") { group("io.lettuce") { modules = [ "lettuce-core" From 98e19999d01bea38385ef4d15518c39037657cc0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:46 +0100 Subject: [PATCH 16/27] Upgrade to Log4j2 2.13.3 Closes gh-21854 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d0c0393353..30775a6ad2 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1021,7 +1021,7 @@ bom { ] } } - library("Log4j2", "2.13.2") { + library("Log4j2", "2.13.3") { group("org.apache.logging.log4j") { modules = [ "log4j-to-slf4j" From fcb2d5df49bed53725a44d963b00cdfed4d080d5 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:48 +0100 Subject: [PATCH 17/27] Upgrade to MongoDB 4.0.4 Closes gh-21855 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 30775a6ad2..d4b432f364 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1211,7 +1211,7 @@ bom { ] } } - library("MongoDB", "4.0.3") { + library("MongoDB", "4.0.4") { group("org.mongodb") { modules = [ "bson", From 3154655a7233c6d9f2509d05fe71a1514949848d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:49 +0100 Subject: [PATCH 18/27] Upgrade to Neo4j OGM 3.2.12 Closes gh-21856 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d4b432f364..437ab8a495 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1245,7 +1245,7 @@ bom { ] } } - library("Neo4j OGM", "3.2.11") { + library("Neo4j OGM", "3.2.12") { group("org.neo4j") { modules = [ "neo4j-ogm-api", From 5e3d48114c11640c2a71a41f0a7ee7e873e8fa56 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:50 +0100 Subject: [PATCH 19/27] Upgrade to Netty 4.1.50.Final Closes gh-21857 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 437ab8a495..029ba9aff6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1258,7 +1258,7 @@ bom { ] } } - library("Netty", "4.1.49.Final") { + library("Netty", "4.1.50.Final") { group("io.netty") { imports = [ "netty-bom" From bf83e237ea33f5a49b55c6392122da9c757a2232 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:52 +0100 Subject: [PATCH 20/27] Upgrade to OkHttp3 3.14.9 Closes gh-21858 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 029ba9aff6..617a629a7c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1310,7 +1310,7 @@ bom { ] } } - library("OkHttp3", "3.14.8") { + library("OkHttp3", "3.14.9") { group("com.squareup.okhttp3") { modules = [ "logging-interceptor", From 6e68101b9fc04de6aba06378c296cf5f33774e55 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:53 +0100 Subject: [PATCH 21/27] Upgrade to Postgresql 42.2.13 Closes gh-21859 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- spring-boot-project/spring-boot-devtools/build.gradle | 5 ++++- spring-boot-project/spring-boot/build.gradle | 5 ++++- .../spring-boot-smoke-test-data-r2dbc-flyway/build.gradle | 5 ++++- .../spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle | 5 ++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 617a629a7c..8721f3d0bf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1380,7 +1380,7 @@ bom { ] } } - library("Postgresql", "42.2.12") { + library("Postgresql", "42.2.13") { group("org.postgresql") { modules = [ "postgresql" diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle index c181fadcfd..9865d7a78f 100644 --- a/spring-boot-project/spring-boot-devtools/build.gradle +++ b/spring-boot-project/spring-boot-devtools/build.gradle @@ -60,7 +60,10 @@ dependencies { testImplementation("org.hsqldb:hsqldb") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mockito:mockito-core") - testImplementation("org.postgresql:postgresql") + testImplementation("org.postgresql:postgresql") { + exclude group: "org.osgi" + exclude group: "com.github.waffle", module: "waffle-jna" + } testImplementation("org.springframework:spring-test") testImplementation("org.springframework:spring-webmvc") testImplementation("org.springframework:spring-websocket") diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index d5641f0cc8..533a4136c3 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -97,7 +97,10 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mariadb.jdbc:mariadb-java-client") testImplementation("org.mockito:mockito-core") - testImplementation("org.postgresql:postgresql") + testImplementation("org.postgresql:postgresql") { + exclude group: "org.osgi" + exclude group: "com.github.waffle", module: "waffle-jna" + } testImplementation("org.springframework:spring-context-support") testImplementation("org.springframework.data:spring-data-redis") testImplementation("org.springframework.data:spring-data-r2dbc") diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle index 77880bfc9a..0b79b8c87d 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-flyway/build.gradle @@ -11,7 +11,10 @@ dependencies { runtimeOnly("io.r2dbc:r2dbc-postgresql") runtimeOnly("org.flywaydb:flyway-core") - runtimeOnly("org.postgresql:postgresql") + runtimeOnly("org.postgresql:postgresql") { + exclude group: "org.osgi" + exclude group: "com.github.waffle", module: "waffle-jna" + } runtimeOnly("org.springframework:spring-jdbc") testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle index e62c90ff74..ed91ba2885 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-r2dbc-liquibase/build.gradle @@ -11,7 +11,10 @@ dependencies { runtimeOnly("io.r2dbc:r2dbc-postgresql") runtimeOnly("org.liquibase:liquibase-core") - runtimeOnly("org.postgresql:postgresql") + runtimeOnly("org.postgresql:postgresql") { + exclude group: "org.osgi" + exclude group: "com.github.waffle", module: "waffle-jna" + } runtimeOnly("org.springframework:spring-jdbc") testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) From df42b3ac39b0aa3ef6cd27d30f4e283c7b627b24 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:54 +0100 Subject: [PATCH 22/27] Upgrade to R2DBC Bom Arabba-SR4 Closes gh-21860 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 8721f3d0bf..a7a3bc16cb 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1418,7 +1418,7 @@ bom { ] } } - library("R2DBC Bom", "Arabba-SR3") { + library("R2DBC Bom", "Arabba-SR4") { group("io.r2dbc") { imports = [ "r2dbc-bom" From 25cc16a54c2610a28cc1a7f6a14b836d7a73b42b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:55 +0100 Subject: [PATCH 23/27] Upgrade to RSocket 1.0.1 Closes gh-21861 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a7a3bc16cb..582851287c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1459,7 +1459,7 @@ bom { ] } } - library("RSocket", "1.0.0") { + library("RSocket", "1.0.1") { group("io.rsocket") { imports = [ "rsocket-bom" From 52975e448007b77f9d9f9c09ceaeeb9821891562 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:56 +0100 Subject: [PATCH 24/27] Upgrade to Spring AMQP 2.2.7.RELEASE Closes gh-21862 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 582851287c..7aa96b6a14 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1652,7 +1652,7 @@ bom { ] } } - library("Spring AMQP", "2.2.6.RELEASE") { + library("Spring AMQP", "2.2.7.RELEASE") { group("org.springframework.amqp") { modules = [ "spring-amqp", From 3e5fcee187ec92015206956fcd3fdbc3eae5dcbb Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:58 +0100 Subject: [PATCH 25/27] Upgrade to Spring Security 5.3.3.RELEASE Closes gh-21863 --- .../OAuth2ResourceServerAutoConfigurationTests.java | 9 +++++++-- .../spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java index e6f666513a..ae987c4bc3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java @@ -28,6 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.nimbusds.jose.JWSAlgorithm; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -99,7 +100,9 @@ class OAuth2ResourceServerAutoConfigurationTests { JwtDecoder jwtDecoder = context.getBean(JwtDecoder.class); Object processor = ReflectionTestUtils.getField(jwtDecoder, "jwtProcessor"); Object keySelector = ReflectionTestUtils.getField(processor, "jwsKeySelector"); - assertThat(keySelector).hasFieldOrPropertyWithValue("jwsAlg", JWSAlgorithm.RS256); + assertThat(keySelector) + .extracting("jwsAlgs", InstanceOfAssertFactories.iterable(JWSAlgorithm.class)) + .containsExactly(JWSAlgorithm.RS256); }); } @@ -112,7 +115,9 @@ class OAuth2ResourceServerAutoConfigurationTests { JwtDecoder jwtDecoder = context.getBean(JwtDecoder.class); Object processor = ReflectionTestUtils.getField(jwtDecoder, "jwtProcessor"); Object keySelector = ReflectionTestUtils.getField(processor, "jwsKeySelector"); - assertThat(keySelector).hasFieldOrPropertyWithValue("jwsAlg", JWSAlgorithm.RS384); + assertThat(keySelector) + .extracting("jwsAlgs", InstanceOfAssertFactories.iterable(JWSAlgorithm.class)) + .containsExactly(JWSAlgorithm.RS384); assertThat(getBearerTokenFilter(context)).isNotNull(); }); } diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 7aa96b6a14..fd63f55138 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1738,7 +1738,7 @@ bom { ] } } - library("Spring Security", "5.3.2.RELEASE") { + library("Spring Security", "5.3.3.RELEASE") { group("org.springframework.security") { imports = [ "spring-security-bom" From 9c639b1be2c449ec47a9266399b678e74e2f21d8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:49:59 +0100 Subject: [PATCH 26/27] Upgrade to Tomcat 9.0.36 Closes gh-21864 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index fd63f55138..d7bb8210ea 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1813,7 +1813,7 @@ bom { ] } } - library("Tomcat", "9.0.35") { + library("Tomcat", "9.0.36") { group("org.apache.tomcat") { modules = [ "tomcat-annotations-api", From 9ef9b635273e2c9aa3bc750704a7c63293651a13 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 10 Jun 2020 12:50:01 +0100 Subject: [PATCH 27/27] Upgrade to Undertow 2.1.3.Final Closes gh-21865 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d7bb8210ea..780208313a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1837,7 +1837,7 @@ bom { ] } } - library("Undertow", "2.1.0.Final") { + library("Undertow", "2.1.3.Final") { group("io.undertow") { modules = [ "undertow-core",