Upgrade to Spring Boot 2.3.1

sdeleuze · sdeleuze · commit 5ae08214fcc0 · 2020-06-15T10:21:13.000+02:00
Closes gh-178
diff --git a/README.adoc b/README.adoc
@@ -1,9 +1,9 @@
 :version: 0.7.0
 :repository: milestone
-:boot-version: 2.3.0.RELEASE
+:boot-version: 2.3.1.RELEASE
 :graalvm-version: 20.1.0
 :graalvm-dev-version: 20.1.0
-:boot-dev-version: 2.3.0.RELEASE
+:boot-dev-version: 2.3.1.RELEASE
 :documentation-url: https://repo.spring.io/{repository}/org/springframework/experimental/spring-graalvm-native-docs/{version}/spring-graalvm-native-docs-{version}.zip!
 
 image:https://ci.spring.io/api/v1/teams/spring-graalvm-native/pipelines/spring-graalvm-native/badge["Build Status", link="https://ci.spring.io/teams/spring-graalvm-native/pipelines/spring-graalvm-native"] image:https://img.shields.io/badge/documentation-blue.svg["Documentation", link="{documentation-url}/reference/index.html"]
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.3.1.RELEASE</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-graalvm-native-configuration/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcHints.java b/spring-graalvm-native-configuration/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcHints.java
@@ -25,6 +25,7 @@
 import org.springframework.boot.web.server.ErrorPageRegistrarBeanPostProcessor;
 import org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor;
 import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
+import org.springframework.boot.web.servlet.server.Encoding;
 import org.springframework.graalvm.extension.NativeImageConfiguration;
 import org.springframework.graalvm.extension.NativeImageHint;
 import org.springframework.graalvm.extension.TypeInfo;
@@ -40,7 +41,8 @@
 				DefaultErrorViewResolver.class,
 				// TODO Maybe the first and last of these 3 needs to be in a more generic configuration hint working for both reactive and servlet
 				ConfigurableWebApplicationContext.class,TomcatEmbeddedWebappClassLoader.class,WebApplicationContext.class,
-				ErrorPage.class,DefaultErrorViewResolver.class,BeanNameViewResolver.class,  ErrorPageRegistrarBeanPostProcessor.class},
+				ErrorPage.class,DefaultErrorViewResolver.class,BeanNameViewResolver.class,  ErrorPageRegistrarBeanPostProcessor.class,
+				Encoding.class},
 				typeNames= {"org.springframework.web.servlet.handler.AbstractHandlerMethodMapping$EmptyHandler"}),
 		@TypeInfo(types= {Callable.class},access=AccessBits.CLASS|AccessBits.DECLARED_METHODS|AccessBits.DECLARED_CONSTRUCTORS)},abortIfTypesMissing = true)
 // TODO this is an interesting one as it is hinted at by both flavours of BeanPostProcessorsRegistrar (reactive and servlet)
diff --git a/spring-graalvm-native-configuration/src/main/resources/initialization.json b/spring-graalvm-native-configuration/src/main/resources/initialization.json
@@ -71,6 +71,7 @@
   {"class": "org.springframework.transaction.annotation.Propagation"},
   {"class": "org.springframework.util.unit.DataUnit"},
   {"class": "org.springframework.util.unit.DataSize"},
+  {"class": "org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter"},
   // To avoid XML parsers to be included
   {"class": "org.springframework.messaging.simp.config.AbstractMessageBrokerConfiguration" },
   {"class": "org.springframework.http.MediaType" },
diff --git a/spring-graalvm-native-samples/actuator-webflux/pom.xml b/spring-graalvm-native-samples/actuator-webflux/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/actuator-webmvc/pom.xml b/spring-graalvm-native-samples/actuator-webmvc/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/commandlinerunner-agent/pom.xml b/spring-graalvm-native-samples/commandlinerunner-agent/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/commandlinerunner/pom.xml b/spring-graalvm-native-samples/commandlinerunner/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/function-aws/pom.xml b/spring-graalvm-native-samples/function-aws/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> 
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/function-netty-fun/pom.xml b/spring-graalvm-native-samples/function-netty-fun/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> 
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/function-netty/pom.xml b/spring-graalvm-native-samples/function-netty/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> 
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/gs-securing-web/pom.xml b/spring-graalvm-native-samples/gs-securing-web/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/jafu-webmvc/pom.xml b/spring-graalvm-native-samples/jafu-webmvc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/jafu/pom.xml b/spring-graalvm-native-samples/jafu/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/kotlin-webmvc/pom.xml b/spring-graalvm-native-samples/kotlin-webmvc/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/logger/pom.xml b/spring-graalvm-native-samples/logger/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/messages/pom.xml b/spring-graalvm-native-samples/messages/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/spring-batch-io/pom.xml b/spring-graalvm-native-samples/spring-batch-io/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/spring-batch/pom.xml b/spring-graalvm-native-samples/spring-batch/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/spring-data-mongodb/pom.xml b/spring-graalvm-native-samples/spring-data-mongodb/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.3.1.RELEASE</version>
         <relativePath/>
     </parent>
     <name>spring-data-mongodb</name>
diff --git a/spring-graalvm-native-samples/spring-features/pom.xml b/spring-graalvm-native-samples/spring-features/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/spring-petclinic-jdbc/pom.xml b/spring-graalvm-native-samples/spring-petclinic-jdbc/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.3.1.RELEASE</version>
         <relativePath />
     </parent>
     <name>spring-petclinic-jdbc</name>
diff --git a/spring-graalvm-native-samples/spring-petclinic-jpa/pom.xml b/spring-graalvm-native-samples/spring-petclinic-jpa/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.3.1.RELEASE</version>
     </parent>
     <name>spring-petclinic-jpa</name>
 
diff --git a/spring-graalvm-native-samples/vanilla-grpc/pom.xml b/spring-graalvm-native-samples/vanilla-grpc/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath /> 
 	</parent>
 
diff --git a/spring-graalvm-native-samples/vanilla-jpa/pom.xml b/spring-graalvm-native-samples/vanilla-jpa/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 	</parent>
 
 	<properties>
diff --git a/spring-graalvm-native-samples/vanilla-orm/pom.xml b/spring-graalvm-native-samples/vanilla-orm/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 	</parent>
 
 	<properties>
diff --git a/spring-graalvm-native-samples/vanilla-thymeleaf/pom.xml b/spring-graalvm-native-samples/vanilla-thymeleaf/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 	</parent>
 
 	<properties>
diff --git a/spring-graalvm-native-samples/vanilla-tx/pom.xml b/spring-graalvm-native-samples/vanilla-tx/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 	</parent>
 
 	<properties>
diff --git a/spring-graalvm-native-samples/web-issue122/build.gradle b/spring-graalvm-native-samples/web-issue122/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '2.3.0.RELEASE'
+	id 'org.springframework.boot' version '2.3.1.RELEASE'
 	id 'io.spring.dependency-management' version '1.0.9.RELEASE'
 	id 'java'
 	id 'eclipse'
diff --git a/spring-graalvm-native-samples/webclient/pom.xml b/spring-graalvm-native-samples/webclient/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/webflux-netty/pom.xml b/spring-graalvm-native-samples/webflux-netty/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.RELEASE</version>
 		<relativePath/> 
 	</parent>
 	<groupId>com.example</groupId>
@@ -29,6 +29,17 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.junit.vintage</groupId>
+					<artifactId>junit-vintage-engine</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/spring-graalvm-native-samples/webflux-r2dbc/pom.xml b/spring-graalvm-native-samples/webflux-r2dbc/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.3.1.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
diff --git a/spring-graalvm-native-substitutions/src/main/java/org/springframework/boot/Target_BeanDefinitionLoader.java b/spring-graalvm-native-substitutions/src/main/java/org/springframework/boot/Target_BeanDefinitionLoader.java
@@ -115,15 +115,15 @@ private int load(Object source) {
 
 	@Substitute
 	private int load(Class<?> source) {
-		if (isComponent(source)) {
+		if (isEligible(source)) {
 			this.annotatedReader.register(source);
 			return 1;
 		}
 		return 0;
 	}
 
 	@Alias
-	private boolean isComponent(Class<?> type) {
+	private boolean isEligible(Class<?> type) {
 		return false;
 	}
 
