From 0c17c89293a9f99d7baec4fa1009619f12a16071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Mon, 15 Jun 2020 11:28:39 +0200 Subject: [PATCH] Upgrade to Spring Boot 2.3.1 Closes gh-287 --- .../autoconfigure/web/servlet/ServletWebServerInitializer.java | 2 +- gradle.properties | 2 +- samples/jafu-reactive-minimal/build.gradle.kts | 2 +- samples/jafu-reactive-r2dbc/build.gradle.kts | 2 +- samples/jafu-servlet-minimal/build.gradle.kts | 2 +- samples/kofu-coroutines-mongodb/build.gradle.kts | 2 +- samples/kofu-coroutines-r2dbc/build.gradle.kts | 2 +- samples/kofu-coroutines-validation/build.gradle.kts | 2 +- samples/kofu-reactive-cassandra/build.gradle.kts | 2 +- samples/kofu-reactive-minimal/build.gradle.kts | 2 +- samples/kofu-reactive-mongodb/build.gradle.kts | 2 +- samples/kofu-reactive-r2dbc/build.gradle.kts | 2 +- samples/kofu-reactive-redis/build.gradle.kts | 2 +- samples/kofu-reactive-validation/build.gradle.kts | 2 +- samples/kofu-servlet-minimal/build.gradle.kts | 2 +- samples/kofu-servlet-validation/build.gradle.kts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/autoconfigure-adapter/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerInitializer.java b/autoconfigure-adapter/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerInitializer.java index b8219f203..b84434313 100644 --- a/autoconfigure-adapter/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerInitializer.java +++ b/autoconfigure-adapter/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerInitializer.java @@ -94,7 +94,7 @@ public void initialize(GenericApplicationContext context) { @Override public WebMvcAutoConfigurationAdapter get() { if (configuration == null) { - configuration = new WebMvcAutoConfigurationAdapter(resourceProperties, webMvcProperties, context, context.getBeanProvider(HttpMessageConverters.class), context.getBeanProvider(ResourceHandlerRegistrationCustomizer.class)); + configuration = new WebMvcAutoConfigurationAdapter(resourceProperties, webMvcProperties, context, context.getBeanProvider(HttpMessageConverters.class), context.getBeanProvider(ResourceHandlerRegistrationCustomizer.class), context.getBeanProvider(DispatcherServletPath.class)); return configuration; } return configuration; diff --git a/gradle.properties b/gradle.properties index f66bef79d..1b6eec696 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -bootVersion=2.3.0.RELEASE +bootVersion=2.3.1.RELEASE diff --git a/samples/jafu-reactive-minimal/build.gradle.kts b/samples/jafu-reactive-minimal/build.gradle.kts index eaaacfc1c..8d4668dbf 100644 --- a/samples/jafu-reactive-minimal/build.gradle.kts +++ b/samples/jafu-reactive-minimal/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.spring.dependency-management") version "1.0.9.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" id("java") } diff --git a/samples/jafu-reactive-r2dbc/build.gradle.kts b/samples/jafu-reactive-r2dbc/build.gradle.kts index 5c1fc1b99..044ca19fa 100644 --- a/samples/jafu-reactive-r2dbc/build.gradle.kts +++ b/samples/jafu-reactive-r2dbc/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.spring.dependency-management") version "1.0.9.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" id("java") } diff --git a/samples/jafu-servlet-minimal/build.gradle.kts b/samples/jafu-servlet-minimal/build.gradle.kts index a07e18969..1671bb2d9 100644 --- a/samples/jafu-servlet-minimal/build.gradle.kts +++ b/samples/jafu-servlet-minimal/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("io.spring.dependency-management") version "1.0.9.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" id("java") } diff --git a/samples/kofu-coroutines-mongodb/build.gradle.kts b/samples/kofu-coroutines-mongodb/build.gradle.kts index 66b4c848e..466ac517e 100644 --- a/samples/kofu-coroutines-mongodb/build.gradle.kts +++ b/samples/kofu-coroutines-mongodb/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-coroutines-r2dbc/build.gradle.kts b/samples/kofu-coroutines-r2dbc/build.gradle.kts index 968769df7..289f858c8 100644 --- a/samples/kofu-coroutines-r2dbc/build.gradle.kts +++ b/samples/kofu-coroutines-r2dbc/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-coroutines-validation/build.gradle.kts b/samples/kofu-coroutines-validation/build.gradle.kts index 530f3d84f..ec2baa26e 100644 --- a/samples/kofu-coroutines-validation/build.gradle.kts +++ b/samples/kofu-coroutines-validation/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-reactive-cassandra/build.gradle.kts b/samples/kofu-reactive-cassandra/build.gradle.kts index dc4b33c20..083d6caee 100644 --- a/samples/kofu-reactive-cassandra/build.gradle.kts +++ b/samples/kofu-reactive-cassandra/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-reactive-minimal/build.gradle.kts b/samples/kofu-reactive-minimal/build.gradle.kts index d7f860b55..643af2c82 100644 --- a/samples/kofu-reactive-minimal/build.gradle.kts +++ b/samples/kofu-reactive-minimal/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-reactive-mongodb/build.gradle.kts b/samples/kofu-reactive-mongodb/build.gradle.kts index 91e8b8538..ed3eb2929 100644 --- a/samples/kofu-reactive-mongodb/build.gradle.kts +++ b/samples/kofu-reactive-mongodb/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-reactive-r2dbc/build.gradle.kts b/samples/kofu-reactive-r2dbc/build.gradle.kts index d4ab801bd..79396a710 100644 --- a/samples/kofu-reactive-r2dbc/build.gradle.kts +++ b/samples/kofu-reactive-r2dbc/build.gradle.kts @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-reactive-redis/build.gradle.kts b/samples/kofu-reactive-redis/build.gradle.kts index 9d507f82f..80226e1c5 100644 --- a/samples/kofu-reactive-redis/build.gradle.kts +++ b/samples/kofu-reactive-redis/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-reactive-validation/build.gradle.kts b/samples/kofu-reactive-validation/build.gradle.kts index 9b94f7c66..a6a242bb4 100644 --- a/samples/kofu-reactive-validation/build.gradle.kts +++ b/samples/kofu-reactive-validation/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-servlet-minimal/build.gradle.kts b/samples/kofu-servlet-minimal/build.gradle.kts index e72832b94..9c78759e0 100644 --- a/samples/kofu-servlet-minimal/build.gradle.kts +++ b/samples/kofu-servlet-minimal/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies { diff --git a/samples/kofu-servlet-validation/build.gradle.kts b/samples/kofu-servlet-validation/build.gradle.kts index 4d16f4bc3..554294246 100644 --- a/samples/kofu-servlet-validation/build.gradle.kts +++ b/samples/kofu-servlet-validation/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id("org.jetbrains.kotlin.jvm") version "1.3.72" id("io.spring.dependency-management") version "1.0.8.RELEASE" - id("org.springframework.boot") version "2.3.0.RELEASE" + id("org.springframework.boot") version "2.3.1.RELEASE" } dependencies {