From 6bdbfbab9a8671f1cf10dc8f8b95e70fa9106f84 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Feb 2022 14:23:39 +0100 Subject: [PATCH 1/6] Upgrade to AppEngine SDK 1.9.95 Closes gh-29943 --- 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 e650f71b646..029c6000e44 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -63,7 +63,7 @@ bom { ] } } - library("AppEngine SDK", "1.9.93") { + library("AppEngine SDK", "1.9.95") { group("com.google.appengine") { modules = [ "appengine-api-1.0-sdk" From dda3bae02ace68f2a046d45a12a3dffc301161bc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Feb 2022 14:23:42 +0100 Subject: [PATCH 2/6] Upgrade to Embedded Mongo 3.4.1 Closes gh-29944 --- .../mongo/embedded/EmbeddedMongoAutoConfiguration.java | 4 ++-- .../autoconfigure/mongo/embedded/EmbeddedMongoProperties.java | 4 ++-- .../mongo/embedded/EmbeddedMongoAutoConfigurationTests.java | 2 +- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java index 3f0f0711f08..aa549805cf3 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.stream.Stream; import com.mongodb.MongoClientSettings; -import de.flapdoodle.embed.mongo.Command; import de.flapdoodle.embed.mongo.MongodExecutable; import de.flapdoodle.embed.mongo.MongodStarter; import de.flapdoodle.embed.mongo.config.Defaults; @@ -32,10 +31,11 @@ import de.flapdoodle.embed.mongo.config.ImmutableMongodConfig; import de.flapdoodle.embed.mongo.config.MongodConfig; import de.flapdoodle.embed.mongo.config.Net; import de.flapdoodle.embed.mongo.config.Storage; -import de.flapdoodle.embed.mongo.distribution.Feature; import de.flapdoodle.embed.mongo.distribution.IFeatureAwareVersion; import de.flapdoodle.embed.mongo.distribution.Version; import de.flapdoodle.embed.mongo.distribution.Versions; +import de.flapdoodle.embed.mongo.packageresolver.Command; +import de.flapdoodle.embed.mongo.packageresolver.Feature; import de.flapdoodle.embed.process.config.RuntimeConfig; import de.flapdoodle.embed.process.config.process.ProcessOutput; import de.flapdoodle.embed.process.config.store.DownloadConfig; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java index 759abb3aa20..e2df5cf4822 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 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,7 +18,7 @@ package org.springframework.boot.autoconfigure.mongo.embedded; import java.util.Set; -import de.flapdoodle.embed.mongo.distribution.Feature; +import de.flapdoodle.embed.mongo.packageresolver.Feature; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.convert.DataSizeUnit; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java index eb56574b9ed..655fb31b414 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java @@ -28,8 +28,8 @@ import de.flapdoodle.embed.mongo.MongodExecutable; import de.flapdoodle.embed.mongo.MongodStarter; import de.flapdoodle.embed.mongo.config.MongodConfig; import de.flapdoodle.embed.mongo.config.Storage; -import de.flapdoodle.embed.mongo.distribution.Feature; import de.flapdoodle.embed.mongo.distribution.Version; +import de.flapdoodle.embed.mongo.packageresolver.Feature; import de.flapdoodle.embed.process.config.RuntimeConfig; import de.flapdoodle.embed.process.config.store.DownloadConfig; import org.bson.Document; diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 029c6000e44..8decdb6e567 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -310,7 +310,7 @@ bom { ] } } - library("Embedded Mongo", "3.3.1") { + library("Embedded Mongo", "3.4.1") { group("de.flapdoodle.embed") { modules = [ "de.flapdoodle.embed.mongo" From 1816f46c199060a240f95e245de1fe2a4a4de6d3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Feb 2022 14:23:45 +0100 Subject: [PATCH 3/6] Upgrade to MariaDB 3.0.3 Closes gh-29945 --- 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 8decdb6e567..182971fe83b 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1109,7 +1109,7 @@ bom { ] } } - library("MariaDB", "2.7.5") { + library("MariaDB", "3.0.3") { group("org.mariadb.jdbc") { modules = [ "mariadb-java-client" From 2406e48b5c52ed725053a7c14a0efc9c94aa6f2e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Feb 2022 14:23:47 +0100 Subject: [PATCH 4/6] Upgrade to MSSQL JDBC 10.2.0.jre8 Closes gh-29946 --- 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 182971fe83b..4bfd7dcc9bf 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1281,7 +1281,7 @@ bom { ] } } - library("MSSQL JDBC", "9.4.1.jre8") { + library("MSSQL JDBC", "10.2.0.jre8") { group("com.microsoft.sqlserver") { modules = [ "mssql-jdbc" From 9cec66bef8d799908c67b6d4b49e9116bd1aff1c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Feb 2022 14:23:49 +0100 Subject: [PATCH 5/6] Upgrade to UnboundID LDAPSDK 6.0.3 Closes gh-29947 --- 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 4bfd7dcc9bf..520aa6a50f0 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1821,7 +1821,7 @@ bom { ] } } - library("UnboundID LDAPSDK", "4.0.14") { + library("UnboundID LDAPSDK", "6.0.3") { group("com.unboundid") { modules = [ "unboundid-ldapsdk" From 288533ba4ab592524c4540f152d8870adacc8b5c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 22 Feb 2022 14:23:52 +0100 Subject: [PATCH 6/6] Upgrade to WebJars Locator Core 0.50 Closes gh-29948 --- 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 520aa6a50f0..93fbdbe5b34 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1844,7 +1844,7 @@ bom { ] } } - library("WebJars Locator Core", "0.48") { + library("WebJars Locator Core", "0.50") { group("org.webjars") { modules = [ "webjars-locator-core"