From aa542858c96518d5262d5893d71886d90776a23b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:20:30 +0200 Subject: [PATCH 1/9] Upgrade to Couchbase Client 3.4.5 Closes gh-35050 --- 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 506a93c6d0..8fd76d3847 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.4") { + library("Couchbase Client", "3.4.5") { group("com.couchbase.client") { modules = [ "java-client" From 2a90c60001b91cd50d204bc9df11761c8327e97d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:20:36 +0200 Subject: [PATCH 2/9] Upgrade to Jetty 11.0.15 Closes gh-35051 --- 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 8fd76d3847..bb2168d5f3 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -644,7 +644,7 @@ bom { ] } } - library("Jetty", "11.0.14") { + library("Jetty", "11.0.15") { group("org.eclipse.jetty") { imports = [ "jetty-bom" From 47e3b4655ae8698b1d9b5767b40f060b1e7870c4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:20:42 +0200 Subject: [PATCH 3/9] Upgrade to jOOQ 3.17.12 Closes gh-35052 --- 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 bb2168d5f3..e697f6345c 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -658,7 +658,7 @@ bom { ] } } - library("jOOQ", "3.17.11") { + library("jOOQ", "3.17.12") { group("org.jooq") { modules = [ "jooq", From 9277465a76952086cf46dd181ee2fcf023a105fa Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:20:47 +0200 Subject: [PATCH 4/9] Upgrade to Lettuce 6.2.4.RELEASE Closes gh-35053 --- 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 e697f6345c..541877eba9 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -772,7 +772,7 @@ bom { ] } } - library("Lettuce", "6.2.3.RELEASE") { + library("Lettuce", "6.2.4.RELEASE") { group("io.lettuce") { modules = [ "lettuce-core" From 9314362c343f833cf20d4de91d82934cd93008c2 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:20:52 +0200 Subject: [PATCH 5/9] Upgrade to MySQL 8.0.33 Closes gh-35054 --- 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 541877eba9..be11d41453 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -995,7 +995,7 @@ bom { ] } } - library("MySQL", "8.0.32") { + library("MySQL", "8.0.33") { group("com.mysql") { modules = [ "mysql-connector-j" { From b30d9d9961ab5753d6c9d2c7fa204733576d021d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:22:28 +0200 Subject: [PATCH 6/9] Upgrade to MySQL 8.0.33 Closes gh-35057 --- 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 fd8a34942b..8586eb9b09 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1371,7 +1371,7 @@ bom { ] } } - library("MySQL", "8.0.32") { + library("MySQL", "8.0.33") { group("com.mysql") { modules = [ "mysql-connector-j" { From caaef89afffb7f266882805e5d2c7c9e3e19338a Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:22:33 +0200 Subject: [PATCH 7/9] Upgrade to Tomcat 9.0.74 Closes gh-35058 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5b5e7fb325..a089e810ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,6 +5,6 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.6.21 -tomcatVersion=9.0.73 +tomcatVersion=9.0.74 kotlin.stdlib.default.dependency=false From 16563a6a0a293ac78c913b0a189ce8e2628a212c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:20:56 +0200 Subject: [PATCH 8/9] Upgrade to Native Build Tools Plugin 0.9.21 Closes gh-35055 --- gradle.properties | 2 +- .../boot/gradle/plugin/NativeImagePluginAction.java | 10 ---------- .../NativeImagePluginActionIntegrationTests.java | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index a2d30611a1..f4fe7fad0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,6 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 kotlinVersion=1.7.22 tomcatVersion=10.1.7 -nativeBuildToolsVersion=0.9.20 +nativeBuildToolsVersion=0.9.21 kotlin.stdlib.default.dependency=false diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java index 1ae66ec959..7526220cb4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/NativeImagePluginAction.java @@ -24,7 +24,6 @@ import org.graalvm.buildtools.gradle.NativeImagePlugin; import org.graalvm.buildtools.gradle.dsl.GraalVMExtension; import org.graalvm.buildtools.gradle.dsl.GraalVMReachabilityMetadataRepositoryExtension; import org.gradle.api.Action; -import org.gradle.api.GradleException; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; @@ -96,15 +95,6 @@ class NativeImagePluginAction implements PluginApplicationAction { private GraalVMExtension configureGraalVmExtension(Project project) { GraalVMExtension extension = project.getExtensions().getByType(GraalVMExtension.class); extension.getToolchainDetection().set(false); - extension.getBinaries().configureEach((options) -> { - try { - options.getRequiredVersion().convention("22.3"); - } - catch (NoSuchMethodError ex) { - throw new GradleException("Incompatible version of org.graalvm.buildtools.native plugin. " - + "Please upgrade to 0.9.17 or later."); - } - }); return extension; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java index e25e6c0455..877fc0ec24 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java @@ -115,12 +115,6 @@ class NativeImagePluginActionIntegrationTests { projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses")); } - @TestTemplate - void nativeImageBinariesRequireGraal22Dot3() { - BuildResult result = this.gradleBuild.build("requiredGraalVersion"); - assertThat(result.getOutput()).contains("custom: 22.3", "main: 22.3", "test: 22.3"); - } - private String projectPath(String path) { try { return new File(this.gradleBuild.getProjectDir(), path).getCanonicalPath(); From 4b947fa915b6fb8ceae28713fa7784641466598b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 18 Apr 2023 13:21:01 +0200 Subject: [PATCH 9/9] Upgrade to SAAJ Impl 3.0.1 Closes gh-35056 --- 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 be11d41453..cace4b95df 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("SAAJ Impl", "3.0.0") { + library("SAAJ Impl", "3.0.1") { group("com.sun.xml.messaging.saaj") { modules = [ "saaj-impl"