root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

This commit is contained in:
Stephane Nicoll 2022-02-22 14:57:04 +01:00
parent 4ea8e7d3f7 288533ba4a
commit fcca4920d3
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfiguration.java
View File

@ -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;

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java
View File

@ -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;

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java
View File

@ -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;

12
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -24,7 +24,7 @@ bom {
]
}
}
library("AppEngine SDK", "1.9.93") {
library("AppEngine SDK", "1.9.95") {
group("com.google.appengine") {
modules = [
"appengine-api-1.0-sdk"
@ -222,7 +222,7 @@ bom {
]
}
}
library("Embedded Mongo", "3.3.1") {
library("Embedded Mongo", "3.4.1") {
group("de.flapdoodle.embed") {
modules = [
"de.flapdoodle.embed.mongo"
@ -799,7 +799,7 @@ bom {
]
}
}
library("MariaDB", "2.7.5") {
library("MariaDB", "3.0.3") {
group("org.mariadb.jdbc") {
modules = [
"mariadb-java-client"
@ -971,7 +971,7 @@ bom {
]
}
}
library("MSSQL JDBC", "9.4.1.jre8") {
library("MSSQL JDBC", "10.2.0.jre8") {
group("com.microsoft.sqlserver") {
modules = [
"mssql-jdbc"
@ -1466,7 +1466,7 @@ bom {
]
}
}
library("UnboundID LDAPSDK", "4.0.14") {
library("UnboundID LDAPSDK", "6.0.3") {
group("com.unboundid") {
modules = [
"unboundid-ldapsdk"
@ -1489,7 +1489,7 @@ bom {
]
}
}
library("WebJars Locator Core", "0.48") {
library("WebJars Locator Core", "0.50") {
group("org.webjars") {
modules = [
"webjars-locator-core"