Upgrade to Spring Boot 2.4.0-RC1

sdeleuze · sdeleuze · commit a8e885538bb6 · 2020-10-30T12:29:35.000+01:00
Closes gh-326
diff --git a/README.adoc b/README.adoc
@@ -3,7 +3,7 @@
 :boot-version: 2.4.0-M3
 :graalvm-version: 20.2.0
 :graalvm-dev-version: 20.3.0-dev
-:boot-dev-version: 2.4.0-M4
+:boot-dev-version: 2.4.0-RC1
 :documentation-url: https://repo.spring.io/{repository}/org/springframework/experimental/spring-graalvm-native-docs/{version}/spring-graalvm-native-docs-{version}.zip!
 
 image:https://img.shields.io/badge/{version}-documentation-blue.svg["{version} documentation", link="{documentation-url}/reference/index.html"]
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.4.0-M4</version>
+				<version>2.4.0-RC1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/spring-graalvm-native-configuration/src/main/java/com/mysql/cj/MySqlHints.java b/spring-graalvm-native-configuration/src/main/java/com/mysql/cj/MySqlHints.java
@@ -39,7 +39,6 @@
 import com.mysql.cj.jdbc.ha.NdbLoadBalanceExceptionChecker;
 import com.mysql.cj.jdbc.ha.StandardLoadBalanceExceptionChecker;
 import com.mysql.cj.log.StandardLogger;
-import com.mysql.cj.protocol.AsyncSocketFactory;
 import com.mysql.cj.protocol.NamedPipeSocketFactory;
 import com.mysql.cj.protocol.SocksProxySocketFactory;
 import com.mysql.cj.protocol.StandardSocketFactory;
@@ -84,11 +83,10 @@
 				UnableToConnectException.class,
 				UnsupportedConnectionStringException.class,
 				WrongArgumentException.class,
-				AsyncSocketFactory.class,
 				NamedPipeSocketFactory.class,
 				SocksProxySocketFactory.class,
 				StandardSocketFactory.class 
-		},access=AccessBits.LOAD_AND_CONSTRUCT),
+		}),
 		@TypeInfo(types= {
 				DeadlockTimeoutRollbackMarker.class,
 				NumberOutOfRange.class,
diff --git a/spring-graalvm-native-configuration/src/main/resources/initialization.json b/spring-graalvm-native-configuration/src/main/resources/initialization.json
@@ -128,6 +128,7 @@
   {"class": "org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory"},
   {"class": "org.springframework.boot.logging.LoggingSystem"},
   {"class": "org.springframework.boot.context.properties.bind.Bindable"},
+  {"class": "org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener"},
 
   // Tomcat, to avoid XML parsers and crypto classes
   {"class": "org.apache.catalina.servlets.DefaultServlet" },
diff --git a/spring-graalvm-native-docs/src/main/asciidoc/index.adoc b/spring-graalvm-native-docs/src/main/asciidoc/index.adoc
@@ -6,7 +6,7 @@
 :project-home: https://github.com/spring-projects-experimental/spring-graalvm-native
 :version: 0.8.2-SNAPSHOT
 :repository: milestone
-:boot-version: 2.4.0-M4
+:boot-version: 2.4.0-RC1
 :graalvm-version: 20.2.0
 = Spring GraalVM Native {version} reference guide
 Andy Clement; Sébastien Deleuze; Filip Hanik; Dave Syer; Esteban Ginez; Jay Bryant
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.4.0-M4</version>
+		<version>2.4.0-RC1</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.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/batch/pom.xml b/spring-graalvm-native-samples/batch/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/>
     </parent>
     <groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/boot-features/pom.xml b/spring-graalvm-native-samples/boot-features/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/cloud/pom.xml b/spring-graalvm-native-samples/cloud/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath />
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/commandlinerunner-jafu/pom.xml b/spring-graalvm-native-samples/commandlinerunner-jafu/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</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.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/>
     </parent>
     <groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/data-jdbc/pom.xml b/spring-graalvm-native-samples/data-jdbc/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/>
     </parent>
 
diff --git a/spring-graalvm-native-samples/data-mongodb-reactive/pom.xml b/spring-graalvm-native-samples/data-mongodb-reactive/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/>
     </parent>
 
diff --git a/spring-graalvm-native-samples/data-mongodb/pom.xml b/spring-graalvm-native-samples/data-mongodb/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/>
     </parent>
 
diff --git a/spring-graalvm-native-samples/data-neo4j/pom.xml b/spring-graalvm-native-samples/data-neo4j/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/>
     </parent>
 
diff --git a/spring-graalvm-native-samples/data-redis/pom.xml b/spring-graalvm-native-samples/data-redis/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/>
     </parent>
 
diff --git a/spring-graalvm-native-samples/features/pom.xml b/spring-graalvm-native-samples/features/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</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.4.0-M4</version>
+		<version>2.4.0-RC1</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.4.0-M4</version>
+		<version>2.4.0-RC1</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.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> 
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/grpc/pom.xml b/spring-graalvm-native-samples/grpc/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath /> 
 	</parent>
 
diff --git a/spring-graalvm-native-samples/hibernate/pom.xml b/spring-graalvm-native-samples/hibernate/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 	</parent>
 
 	<properties>
diff --git a/spring-graalvm-native-samples/jdbc-tx/pom.xml b/spring-graalvm-native-samples/jdbc-tx/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 	</parent>
 
 	<properties>
diff --git a/spring-graalvm-native-samples/jpa/pom.xml b/spring-graalvm-native-samples/jpa/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 	</parent>
 
 	<properties>
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.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/petclinic-jdbc/pom.xml b/spring-graalvm-native-samples/petclinic-jdbc/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath />
     </parent>
 
diff --git a/spring-graalvm-native-samples/petclinic-jpa/pom.xml b/spring-graalvm-native-samples/petclinic-jpa/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
     </parent>
 
     <properties>
diff --git a/spring-graalvm-native-samples/security/pom.xml b/spring-graalvm-native-samples/security/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/validator/pom.xml b/spring-graalvm-native-samples/validator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath />
     </parent>
     <groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/wavefront/pom.xml b/spring-graalvm-native-samples/wavefront/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
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.4.0-M4</version>
+		<version>2.4.0-RC1</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.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> 
 	</parent>
 	<groupId>com.example</groupId>
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.4.0-M4</version>
+        <version>2.4.0-RC1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/webflux-thymeleaf/pom.xml b/spring-graalvm-native-samples/webflux-thymeleaf/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 	</parent>
 	<properties>
 		<java.version>1.8</java.version>
diff --git a/spring-graalvm-native-samples/webmvc-functional/pom.xml b/spring-graalvm-native-samples/webmvc-functional/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath />
 	</parent>
 
diff --git a/spring-graalvm-native-samples/webmvc-jafu/pom.xml b/spring-graalvm-native-samples/webmvc-jafu/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/webmvc-kotlin/build.gradle.kts b/spring-graalvm-native-samples/webmvc-kotlin/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
 
 plugins {
-    id("org.springframework.boot") version "2.4.0-M4"
+    id("org.springframework.boot") version "2.4.0-RC1"
     id("io.spring.dependency-management") version "1.0.10.RELEASE"
     kotlin("jvm") version "1.4.10"
     kotlin("plugin.spring") version "1.4.10"
@@ -13,6 +13,7 @@ version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven { url = uri("https://repo.spring.io/milestone") }
     maven { url = uri("https://repo.spring.io/snapshot") }
diff --git a/spring-graalvm-native-samples/webmvc-tomcat/pom.xml b/spring-graalvm-native-samples/webmvc-tomcat/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.4.0-M4</version>
+		<version>2.4.0-RC1</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/spring-graalvm-native-samples/webmvc-tomcat/src/main/resources/application.properties b/spring-graalvm-native-samples/webmvc-tomcat/src/main/resources/application.properties
@@ -1 +1 @@
-spring.resources.cache.cachecontrol.max-age=12h
+spring.web.resources.cache.cachecontrol.max-age=12h
diff --git a/spring-graalvm-native-substitutions/src/main/java/org/springframework/boot/SpringBootFactories.java b/spring-graalvm-native-substitutions/src/main/java/org/springframework/boot/SpringBootFactories.java
@@ -105,9 +105,6 @@ public abstract class SpringBootFactories {
 			factories.add(PropertySourceLoader.class, new YamlPropertySourceLoader());
 		}
 
-		// ConfigData Location Resolvers
-		factories.add(ConfigDataLocationResolver.class, new ConfigTreeConfigDataLocationResolver());
-
 		// ConfigData Loaders
 		factories.add(ConfigDataLoader.class, new ConfigTreeConfigDataLoader());
 		factories.add(ConfigDataLoader.class, new StandardConfigDataLoader());
@@ -132,6 +129,8 @@ public abstract class SpringBootFactories {
 					new ConfigDataEnvironmentPostProcessor(logFactory, new DefaultBootstrapContext()) {
 						@Override
 						public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
+							// ConfigData Location Resolvers
+							factories.add(ConfigDataLocationResolver.class, new ConfigTreeConfigDataLocationResolver(application.getResourceLoader()));
 							factories.add(ConfigDataLocationResolver.class, new StandardConfigDataLocationResolver(logFactory.getLog(ConfigDataLocationResolver.class), Binder.get(environment), application.getResourceLoader()));
 							super.postProcessEnvironment(environment, application);
 						}
