From c8178b21b7cbfd71f14312c9370002104022bda5 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:13:33 +0200 Subject: [PATCH 01/10] Upgrade to Elasticsearch 7.17.13 Closes gh-37286 --- 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 2c0e05643e6..3798b1087c6 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -306,7 +306,7 @@ bom { ] } } - library("Elasticsearch", "7.17.12") { + library("Elasticsearch", "7.17.13") { group("org.elasticsearch") { modules = [ "elasticsearch" From 0b2f22be591559bdd5c22e38b93c7d6ec3e71887 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:13:38 +0200 Subject: [PATCH 02/10] Upgrade to Jetty 9.4.52.v20230823 Closes gh-37287 --- 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 3798b1087c6..c1335a1eb65 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -980,7 +980,7 @@ bom { ] } } - library("Jetty", "9.4.51.v20230217") { + library("Jetty", "9.4.52.v20230823") { prohibit { versionRange "[10.0.0-alpha0,)" because "it requires Java 11" From 615d4b83ef02ce958456e9c72e9a585b6bc2256b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:13:42 +0200 Subject: [PATCH 03/10] Upgrade to Tomcat 9.0.80 Closes gh-37288 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 62e7f362287..3ad65fd3f7f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.6.21 springFrameworkVersion=5.3.30-SNAPSHOT -tomcatVersion=9.0.79 +tomcatVersion=9.0.80 kotlin.stdlib.default.dependency=false From a52d7e255b72360e4391dd3fe9e8f600adba9c42 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:20:00 +0200 Subject: [PATCH 04/10] Upgrade to Couchbase Client 3.4.10 Closes gh-37289 --- .../boot/autoconfigure/couchbase/CouchbaseProperties.java | 4 ++-- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java index 4dc0e252ffb..2e5e4180137 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2023 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. @@ -117,7 +117,7 @@ public class CouchbaseProperties { * Length of time an HTTP connection may remain idle before it is closed and * removed from the pool. */ - private Duration idleHttpConnectionTimeout = Duration.ofMillis(4500); + private Duration idleHttpConnectionTimeout = Duration.ofSeconds(1); public int getMinEndpoints() { return this.minEndpoints; diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index a3ad68256cd..073ccd1f5fc 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -173,7 +173,7 @@ bom { ] } } - library("Couchbase Client", "3.4.8") { + library("Couchbase Client", "3.4.10") { prohibit { versionRange "[3.4.9]" because "it contains unshaded io.opentelemetry classes that break our Otel integration" From bb8b31d8658aa67f2ade58003f0bb06508e1885e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:20:05 +0200 Subject: [PATCH 05/10] Upgrade to Infinispan 14.0.17.Final Closes gh-37290 --- 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 073ccd1f5fc..b41aa16ea3a 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -437,7 +437,7 @@ bom { ] } } - library("Infinispan", "14.0.14.Final") { + library("Infinispan", "14.0.17.Final") { group("org.infinispan") { imports = [ "infinispan-bom" From 902eb2d7fa7378d73148b92489694b8ebd1c37e0 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:20:11 +0200 Subject: [PATCH 06/10] Upgrade to Jetty 11.0.16 Closes gh-37291 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../spring-boot-starters/spring-boot-starter-jetty/build.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index b41aa16ea3a..6954305d52b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -650,7 +650,7 @@ bom { ] } } - library("Jetty", "11.0.15") { + library("Jetty", "11.0.16") { group("org.eclipse.jetty") { imports = [ "jetty-bom" diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle index eb83be39310..5d677c3fe59 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/build.gradle @@ -18,7 +18,6 @@ dependencies { exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-websocket-api") } api("org.eclipse.jetty.websocket:websocket-jetty-server") { - exclude group: "org.eclipse.jetty", module: "jetty-jndi" exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api") } } From 873323f36f1b14685c6b360e6db707c117164e11 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:20:15 +0200 Subject: [PATCH 07/10] Upgrade to Native Build Tools Plugin 0.9.26 Closes gh-37292 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ce029ec16d0..d917b145989 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 -nativeBuildToolsVersion=0.9.24 +nativeBuildToolsVersion=0.9.26 springFrameworkVersion=6.0.12-SNAPSHOT tomcatVersion=10.1.12 From b30ff3c6b2567e2fd22496eb20ef011e57bd1591 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:20:20 +0200 Subject: [PATCH 08/10] Upgrade to SLF4J 2.0.9 Closes gh-37293 --- 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 6954305d52b..85e87e40254 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1325,7 +1325,7 @@ bom { ] } } - library("SLF4J", "2.0.7") { + library("SLF4J", "2.0.9") { group("org.slf4j") { modules = [ "jcl-over-slf4j", From 697f3bb6b4fd9830395f63b0cfda2dcf33fca95a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:20:24 +0200 Subject: [PATCH 09/10] Upgrade to Spring Kafka 3.0.11 Closes gh-37294 --- 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 85e87e40254..1b3a0ac9178 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1411,7 +1411,7 @@ bom { ] } } - library("Spring Kafka", "3.0.10") { + library("Spring Kafka", "3.0.11") { considerSnapshots() group("org.springframework.kafka") { modules = [ From 35dd81ae22448ddccb680f0e3e1125b7033fa256 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 11 Sep 2023 10:20:29 +0200 Subject: [PATCH 10/10] Upgrade to Tomcat 10.1.13 Closes gh-37295 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d917b145989..29f4c8645fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,6 +7,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 nativeBuildToolsVersion=0.9.26 springFrameworkVersion=6.0.12-SNAPSHOT -tomcatVersion=10.1.12 +tomcatVersion=10.1.13 kotlin.stdlib.default.dependency=false