Upgrade to Spring Boot 2.7.7

sdeleuze · sdeleuze · commit 697840d99a29 · 2023-01-02T15:35:17.000+01:00
It fixes Spring Boot 2.7.6+ compatiblity. Closes gh-1740
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 		<asm.version>9.2</asm.version>
 		<graalvm.version>22.1.0.1</graalvm.version>
 		<docs.resources.version>0.2.1.RELEASE</docs.resources.version>
-		<spring.boot.version>2.7.1</spring.boot.version>
+		<spring.boot.version>2.7.7</spring.boot.version>
 		<spring.cloud.version>2021.0.3</spring.cloud.version>
 		<spring.security.authorization-server.version>0.1.0</spring.security.authorization-server.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/samples/commandlinerunner-gradle/build.gradle b/samples/commandlinerunner-gradle/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '2.7.1'
+	id 'org.springframework.boot' version '2.7.7'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'org.springframework.experimental.aot' version '0.12.2-SNAPSHOT'
 	id 'java'
diff --git a/samples/commandlinerunner-log4j2/.ignore b/samples/commandlinerunner-log4j2/.ignore
diff --git a/samples/maven-parent/pom.xml b/samples/maven-parent/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.7</version>
 		<relativePath/>
 	</parent>
 	<groupId>org.springframework.experimental</groupId>
diff --git a/samples/multi-modules/build.gradle b/samples/multi-modules/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-	id 'org.springframework.boot' version '2.7.1' apply false
+	id 'org.springframework.boot' version '2.7.7' apply false
 	id 'org.springframework.experimental.aot' version '0.12.2-SNAPSHOT' apply false
 }
 
diff --git a/samples/multi-modules/pom.xml b/samples/multi-modules/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.example</groupId>
diff --git a/samples/security-kotlin/build.gradle.kts b/samples/security-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.7.1"
+    id("org.springframework.boot") version "2.7.7"
 	id("io.spring.dependency-management") version "1.0.10.RELEASE"
     id("org.springframework.experimental.aot") version "0.12.2-SNAPSHOT"
     kotlin("jvm") version "1.6.10"
diff --git a/samples/webmvc-kotlin/build.gradle.kts b/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.7.1"
+    id("org.springframework.boot") version "2.7.7"
 	id("io.spring.dependency-management") version "1.0.10.RELEASE"
     id("org.springframework.experimental.aot") version "0.12.2-SNAPSHOT"
     kotlin("jvm") version "1.6.10"
diff --git a/spring-aot-maven-plugin/src/it/runner/pom.xml b/spring-aot-maven-plugin/src/it/runner/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.1</version>
+		<version>2.7.7</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.spring.test</groupId>
diff --git a/spring-aot/src/main/java/org/springframework/boot/AotApplicationContextFactory.java b/spring-aot/src/main/java/org/springframework/boot/AotApplicationContextFactory.java
@@ -26,6 +26,7 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.util.Assert;
 
 /**
  * Prepare an application context for AOT processing.
@@ -75,25 +76,17 @@ private GenericApplicationContext createApplicationContext(SpringApplication app
 	}
 
 	private static ConfigurableEnvironment getOrCreateEnvironment(WebApplicationType webApplicationType) {
-		switch (webApplicationType) {
-			case SERVLET:
-				return new ApplicationServletEnvironment();
-			case REACTIVE:
-				return new ApplicationReactiveWebEnvironment();
-			default:
-				return new ApplicationEnvironment();
-		}
+		ConfigurableEnvironment environment = ApplicationContextFactory.DEFAULT.createEnvironment(webApplicationType);
+		return (environment != null) ? environment : new ApplicationEnvironment();
 	}
 
 	private static Class<? extends StandardEnvironment> deduceEnvironmentClass(WebApplicationType webApplicationType) {
-		switch (webApplicationType) {
-			case SERVLET:
-				return ApplicationServletEnvironment.class;
-			case REACTIVE:
-				return ApplicationReactiveWebEnvironment.class;
-			default:
-				return ApplicationEnvironment.class;
+		Class<? extends ConfigurableEnvironment> environmentType = ApplicationContextFactory.DEFAULT.getEnvironmentType(webApplicationType);
+		if (environmentType == null) {
+			return ApplicationEnvironment.class;
 		}
+		Assert.isAssignable(StandardEnvironment.class, environmentType);
+		return (Class<? extends StandardEnvironment>) environmentType;
 	}
 
 	private void bindToSpringApplication(ConfigurableEnvironment environment, SpringApplication application) {
diff --git a/spring-aot/src/test/java/org/springframework/boot/AotApplicationContextFactoryTests.java b/spring-aot/src/test/java/org/springframework/boot/AotApplicationContextFactoryTests.java
@@ -28,6 +28,7 @@
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
+import org.springframework.web.context.support.StandardServletEnvironment;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -43,7 +44,8 @@ void createApplicationContextDetectTypeFromClasspath() {
 		GenericApplicationContext context = new AotApplicationContextFactory(createResourceLoader("empty"))
 				.createApplicationContext(TestApplication.class);
 		assertThat(context).isInstanceOf(AnnotationConfigServletWebServerApplicationContext.class);
-		assertThat(context.getEnvironment()).isInstanceOf(ApplicationServletEnvironment.class);
+		assertThat(context.getEnvironment()).isInstanceOf(StandardServletEnvironment.class);
+		assertThat(context.getEnvironment().getClass().getName()).endsWith("ApplicationServletEnvironment");
 		assertThat(context.isRunning()).isFalse();
 	}
 
diff --git a/spring-native-configuration/src/main/java/org/springframework/hateoas/config/HateoasHints.java b/spring-native-configuration/src/main/java/org/springframework/hateoas/config/HateoasHints.java
@@ -41,6 +41,7 @@
 import org.springframework.nativex.domain.proxies.JdkProxyDescriptor;
 import org.springframework.nativex.hint.AccessBits;
 import org.springframework.nativex.hint.FieldHint;
+import org.springframework.nativex.hint.ResourceHint;
 import org.springframework.nativex.hint.TypeAccess;
 import org.springframework.nativex.hint.InitializationHint;
 import org.springframework.nativex.hint.InitializationTime;
@@ -100,7 +101,8 @@
 		imports = {
 				PluginHints.class,
 				JacksonHints.class,
-		}
+		},
+		resources = @ResourceHint(patterns = "org/springframework/web/context/ContextLoader.properties")
 )
 public class HateoasHints implements NativeConfiguration, TypeSystemNativeConfiguration {
 
diff --git a/spring-native-configuration/src/test/java/org/springframework/nativex/ResourcesTests.java b/spring-native-configuration/src/test/java/org/springframework/nativex/ResourcesTests.java
@@ -30,7 +30,9 @@ public void testApacheTomcatResources() throws Exception {
 		InputStream s = this.getClass().getResourceAsStream("/META-INF/native-image/org.apache.tomcat.embed/tomcat-embed-core/tomcat-resource.json");
 		ResourcesDescriptor read = ResourcesJsonMarshaller.read(s);
 		Assert.assertTrue(read.getBundles().contains("javax.servlet.LocalStrings"));
-		Assert.assertTrue(read.getPatterns().contains(".*/mbeans-descriptors.xml$"));
+		Assert.assertTrue(read.getPatterns().contains("^org/apache/tomcat/.*mbeans-descriptors\\.xml$"));
+		Assert.assertTrue(read.getPatterns().contains("^org/apache/catalina/.*mbeans-descriptors\\.xml$"));
+		Assert.assertTrue(read.getPatterns().contains("^org/apache/coyote/.*mbeans-descriptors\\.xml$"));
 	}
 
 	@Test
diff --git a/spring-native-docs/src/main/asciidoc/attributes.adoc b/spring-native-docs/src/main/asciidoc/attributes.adoc
@@ -27,14 +27,14 @@
 :graalvm-native-buildtools: https://github.com/graalvm/native-build-tools
 :graalvm-native-buildtools-version: 0.9.13
 
-:spring-boot-version: 2.7.1
+:spring-boot-version: 2.7.7
 :spring-boot-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference
 :spring-boot-gradle-plugin-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/gradle-plugin/reference/htmlsingle/
 :spring-boot-maven-plugin-docs: https://docs.spring.io/spring-boot/docs/{spring-boot-version}/maven-plugin/reference/htmlsingle/
 
 :spring-cloud-version: 2021.0.3
 
-:spring-framework-version: current
+:spring-framework-version: 5.3.x
 :spring-framework-api: https://docs.spring.io/spring-framework/docs/{spring-framework-version}/javadoc-api
 :spring-framework-docs: https://docs.spring.io/spring-framework/docs/{spring-framework-version}/reference
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'io.spring.dependency-management' version '1.0.11.RELEASE'`
`3`		`- id 'org.springframework.boot' version '2.7.1' apply false`
	`3`	`+ id 'org.springframework.boot' version '2.7.7' apply false`
`4`	`4`	`id 'org.springframework.experimental.aot' version '0.12.2-SNAPSHOT' apply false`
`5`	`5`	`}`
`6`	`6`