From d16aa3f377f577ca5a52336cda125e7d73312a99 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:13 +0100 Subject: [PATCH 01/15] Upgrade to Byte Buddy 1.10.14 Closes gh-22859 --- 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 11a8b8983bf..897d0084e1b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -142,7 +142,7 @@ bom { ] } } - library("Byte Buddy", "1.10.13") { + library("Byte Buddy", "1.10.14") { group("net.bytebuddy") { modules = [ "byte-buddy", From 6cb7eb926ec45a01ca2de34623417187a26d81ed Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:14 +0100 Subject: [PATCH 02/15] Upgrade to Commons Pool2 2.8.1 Closes gh-22860 --- 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 897d0084e1b..c9bb9f44bef 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -209,7 +209,7 @@ bom { ] } } - library("Commons Pool2", "2.8.0") { + library("Commons Pool2", "2.8.1") { group("org.apache.commons") { modules = [ "commons-pool2" From 8af4246db56ff47102f16923bea5ef5240ae71fc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:16 +0100 Subject: [PATCH 03/15] Upgrade to Couchbase Client 3.0.7 Closes gh-22861 --- 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 c9bb9f44bef..272fb7a172c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -216,7 +216,7 @@ bom { ] } } - library("Couchbase Client", "3.0.6") { + library("Couchbase Client", "3.0.7") { group("com.couchbase.client") { modules = [ "java-client" From 977f33ad8064fd34d716bd6090f6bb37059abed8 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:17 +0100 Subject: [PATCH 04/15] Upgrade to Dependency Management Plugin 1.0.10.RELEASE Closes gh-22862 --- 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 272fb7a172c..411de537b1d 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -230,7 +230,7 @@ bom { ] } } - library("Dependency Management Plugin", "1.0.9.RELEASE") { + library("Dependency Management Plugin", "1.0.10.RELEASE") { group("io.spring.gradle") { modules = [ "dependency-management-plugin" From 38891f7594debeef320ebcfc7050e9234f407dcf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:19 +0100 Subject: [PATCH 05/15] Upgrade to Dropwizard Metrics 4.1.12.1 Closes gh-22863 --- 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 411de537b1d..7f59a4e3b04 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -248,7 +248,7 @@ bom { ] } } - library("Dropwizard Metrics", "4.1.11") { + library("Dropwizard Metrics", "4.1.12.1") { group("io.dropwizard.metrics") { imports = [ "metrics-bom" From 7a0af85b6ec630c00e56623ce1f0cc0973c6236b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:20 +0100 Subject: [PATCH 06/15] Upgrade to Hibernate 5.4.20.Final Closes gh-22864 --- 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 7f59a4e3b04..ca30925969b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -410,7 +410,7 @@ bom { ] } } - library("Hibernate", "5.4.18.Final") { + library("Hibernate", "5.4.20.Final") { group("org.hibernate") { modules = [ "hibernate-c3p0", From c89bc5120eff2e16612ef82beaf44700994de562 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:22 +0100 Subject: [PATCH 07/15] Upgrade to Jackson Bom 2.11.2 Closes gh-22865 --- 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 ca30925969b..f5ef88c2738 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -548,7 +548,7 @@ bom { ] } } - library("Jackson Bom", "2.11.1") { + library("Jackson Bom", "2.11.2") { group("com.fasterxml.jackson") { imports = [ "jackson-bom" From 6b843d3066ded0e7f680691b963f7052d46547f2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:23 +0100 Subject: [PATCH 08/15] Upgrade to Jetty 9.4.31.v20200723 Closes gh-22866 --- 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 f5ef88c2738..6a266b97f8a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -850,7 +850,7 @@ bom { ] } } - library("Jetty", "9.4.30.v20200611") { + library("Jetty", "9.4.31.v20200723") { group("org.eclipse.jetty") { imports = [ "jetty-bom" From e8307178c3af70d08bb00242602d26f48377342c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:24 +0100 Subject: [PATCH 09/15] Upgrade to jOOQ 3.13.4 Closes gh-22867 --- 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 6a266b97f8a..d22c833adbe 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -887,7 +887,7 @@ bom { ] } } - library("jOOQ", "3.13.3") { + library("jOOQ", "3.13.4") { group("org.jooq") { modules = [ "jooq", From abf6123baebf25edf901bf9399440966578aed1a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:26 +0100 Subject: [PATCH 10/15] Upgrade to Kafka 2.5.1 Closes gh-22868 --- .../metrics/KafkaMetricsAutoConfigurationTests.java | 13 +++++++++++++ .../KafkaAutoConfigurationIntegrationTests.java | 13 ++++++++++++- .../spring-boot-dependencies/build.gradle | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java index 11c14b60566..8a2dcf27c15 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/KafkaMetricsAutoConfigurationTests.java @@ -16,12 +16,19 @@ package org.springframework.boot.actuate.autoconfigure.metrics; +import java.util.regex.Pattern; + +import org.apache.kafka.streams.StreamsBuilder; +import org.apache.kafka.streams.kstream.KStream; +import org.apache.kafka.streams.kstream.KTable; +import org.apache.kafka.streams.kstream.Materialized; import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.kafka.annotation.EnableKafkaStreams; import org.springframework.kafka.config.StreamsBuilderFactoryBean; @@ -93,6 +100,12 @@ class KafkaMetricsAutoConfigurationTests { @EnableKafkaStreams static class EnableKafkaStreamsConfiguration { + @Bean + KTable table(StreamsBuilder builder) { + KStream stream = builder.stream(Pattern.compile("test")); + return stream.groupByKey().count(Materialized.as("store")); + } + } } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java index 71c4d635e2c..7c9925c9228 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.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. @@ -18,9 +18,14 @@ package org.springframework.boot.autoconfigure.kafka; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; import org.apache.kafka.clients.admin.NewTopic; import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.streams.StreamsBuilder; +import org.apache.kafka.streams.kstream.KStream; +import org.apache.kafka.streams.kstream.KTable; +import org.apache.kafka.streams.kstream.Materialized; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -124,6 +129,12 @@ class KafkaAutoConfigurationIntegrationTests { @EnableKafkaStreams static class KafkaStreamsConfig { + @Bean + KTable table(StreamsBuilder builder) { + KStream stream = builder.stream(Pattern.compile("test")); + return stream.groupByKey().count(Materialized.as("store")); + } + } static class Listener { diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index d22c833adbe..b571eba0f9c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -949,7 +949,7 @@ bom { ] } } - library("Kafka", "2.5.0") { + library("Kafka", "2.5.1") { group("org.apache.kafka") { modules = [ "connect-api", From 006d960044b512a011743cd514c3329b4d80487a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:28 +0100 Subject: [PATCH 11/15] Upgrade to Lettuce 5.3.3.RELEASE Closes gh-22869 --- 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 b571eba0f9c..ebad8e56d61 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -987,7 +987,7 @@ bom { ] } } - library("Lettuce", "5.3.2.RELEASE") { + library("Lettuce", "5.3.3.RELEASE") { group("io.lettuce") { modules = [ "lettuce-core" From ad109c10d3ce55691201d266bb73cd07a9adf7bf Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:29 +0100 Subject: [PATCH 12/15] Upgrade to Pooled JMS 1.1.2 Closes gh-22870 --- 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 ebad8e56d61..348274a764f 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1352,7 +1352,7 @@ bom { ] } } - library("Pooled JMS", "1.1.1") { + library("Pooled JMS", "1.1.2") { group("org.messaginghub") { modules = [ "pooled-jms" From 33ece49921f190cd744ac5b2c0b704632662b478 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:31 +0100 Subject: [PATCH 13/15] Upgrade to RSocket 1.0.2 Closes gh-22871 --- 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 348274a764f..cd486ff0262 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1438,7 +1438,7 @@ bom { ] } } - library("RSocket", "1.0.1") { + library("RSocket", "1.0.2") { group("io.rsocket") { imports = [ "rsocket-bom" From 4f79f39b31126f7c25518f1ff6fd8689d8cdc216 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:32 +0100 Subject: [PATCH 14/15] Upgrade to Spring HATEOAS 1.1.1.RELEASE Closes gh-22872 --- 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 cd486ff0262..b64f4d4fa8b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1665,7 +1665,7 @@ bom { ] } } - library("Spring HATEOAS", "1.1.0.RELEASE") { + library("Spring HATEOAS", "1.1.1.RELEASE") { group("org.springframework.hateoas") { modules = [ "spring-hateoas" From 289797b5d42ddc89b6e9c638a65be28bf322163f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 11 Aug 2020 12:17:34 +0100 Subject: [PATCH 15/15] Upgrade to Spring Security 5.3.4.RELEASE Closes gh-22873 --- 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 b64f4d4fa8b..02c3c0fd232 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1717,7 +1717,7 @@ bom { ] } } - library("Spring Security", "5.3.3.RELEASE") { + library("Spring Security", "5.3.4.RELEASE") { group("org.springframework.security") { imports = [ "spring-security-bom"