Start building against Spring Boot 2.7.0-RC1 snapshots

sdeleuze · snicoll · snicoll · commit 1ecc030fbd13 · 2022-04-25T18:08:17.000+02:00
See spring-atticgh-1541 Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 		<asm.version>9.2</asm.version>
 		<graalvm.version>22.0.0</graalvm.version>
 		<docs.resources.version>0.2.1.RELEASE</docs.resources.version>
-		<spring.boot.version>2.6.6</spring.boot.version>
+		<spring.boot.version>2.7.0-SNAPSHOT</spring.boot.version>
 		<spring.cloud.version>2021.0.1</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.6.6'
+	id 'org.springframework.boot' version '2.7.0-SNAPSHOT'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'org.springframework.experimental.aot' version '0.12.0-SNAPSHOT'
 	id 'java'
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.6.6</version>
+		<version>2.7.0-SNAPSHOT</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.6.6' apply false
+	id 'org.springframework.boot' version '2.7.0-SNAPSHOT' apply false
 	id 'org.springframework.experimental.aot' version '0.12.0-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.6.6</version>
+		<version>2.7.0-SNAPSHOT</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.6.6"
+    id("org.springframework.boot") version "2.7.0-SNAPSHOT"
     id("io.spring.dependency-management") version "1.0.10.RELEASE"
     id("org.springframework.experimental.aot") version "0.12.0-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.6.6"
+    id("org.springframework.boot") version "2.7.0-SNAPSHOT"
     id("io.spring.dependency-management") version "1.0.10.RELEASE"
     id("org.springframework.experimental.aot") version "0.12.0-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.6.6</version>
+		<version>2.7.0-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.spring.test</groupId>
diff --git a/spring-aot/src/main/java/org/springframework/validation/annotation/ValidatedNativeConfigurationProcessor.java b/spring-aot/src/main/java/org/springframework/validation/annotation/ValidatedNativeConfigurationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-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.
diff --git a/spring-native-configuration/src/main/java/org/h2/H2Hints.java b/spring-native-configuration/src/main/java/org/h2/H2Hints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-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.
@@ -16,16 +16,15 @@
 
 package org.h2;
 
-import org.h2.mvstore.db.MVTableEngine;
-import org.h2.store.fs.FilePathAsync;
-import org.h2.store.fs.FilePathDisk;
-import org.h2.store.fs.FilePathMem;
-import org.h2.store.fs.FilePathNio;
-import org.h2.store.fs.FilePathNioMapped;
-import org.h2.store.fs.FilePathNioMem;
-import org.h2.store.fs.FilePathRetryOnInterrupt;
-import org.h2.store.fs.FilePathSplit;
-import org.h2.store.fs.FilePathZip;
+import org.h2.store.fs.async.FilePathAsync;
+import org.h2.store.fs.disk.FilePathDisk;
+import org.h2.store.fs.mem.FilePathMem;
+import org.h2.store.fs.niomapped.FilePathNioMapped;
+import org.h2.store.fs.niomem.FilePathNioMem;
+import org.h2.store.fs.retry.FilePathRetryOnInterrupt;
+import org.h2.store.fs.split.FilePathSplit;
+import org.h2.store.fs.zip.FilePathZip;
+
 import org.springframework.nativex.hint.InitializationHint;
 import org.springframework.nativex.hint.InitializationTime;
 import org.springframework.nativex.hint.NativeHint;
@@ -38,12 +37,11 @@
 				FilePathMem.class,
 				FilePathNioMem.class,
 				FilePathSplit.class,
-				FilePathNio.class,
+				FilePathNioMem.class,
 				FilePathNioMapped.class,
 				FilePathAsync.class,
 				FilePathZip.class,
-				FilePathRetryOnInterrupt.class,
-				MVTableEngine.class
+				FilePathRetryOnInterrupt.class
 		}, typeNames= { "org.h2.store.fs.FilePathMemLZF","org.h2.store.fs.FilePathNioMemLZF" }),
 		initialization = @InitializationHint(types = org.h2.util.Bits.class, initTime = InitializationTime.BUILD)
 		)
diff --git a/spring-native-configuration/src/main/java/org/mariadb/MariaDbHints.java b/spring-native-configuration/src/main/java/org/mariadb/MariaDbHints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-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.
@@ -16,16 +16,16 @@
 
 package org.mariadb;
 
+import org.mariadb.jdbc.Configuration;
 import org.mariadb.jdbc.Driver;
-import org.mariadb.jdbc.util.Options;
 import org.springframework.nativex.hint.FieldHint;
 import org.springframework.nativex.hint.NativeHint;
 import org.springframework.nativex.hint.ResourceHint;
 import org.springframework.nativex.hint.TypeHint;
 import org.springframework.nativex.type.NativeConfiguration;
 
 @NativeHint(trigger = Driver.class, types = {
-		@TypeHint(types = Options.class, fields = {
+		@TypeHint(types = Configuration.Builder.class, fields = {
 				// Parameters and categories are explained here:
 				// https://mariadb.com/kb/en/about-mariadb-connector-j/
 
diff --git a/spring-native-configuration/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointAutoConfigurationHints.java b/spring-native-configuration/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/EndpointAutoConfigurationHints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-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.
@@ -17,6 +17,7 @@
 package org.springframework.boot.actuate.autoconfigure.endpoint;
 
 import org.springframework.boot.actuate.context.ShutdownEndpoint;
+import org.springframework.boot.actuate.endpoint.ApiVersion;
 import org.springframework.boot.actuate.endpoint.EndpointFilter;
 import org.springframework.boot.actuate.endpoint.annotation.DeleteOperation;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
@@ -25,7 +26,6 @@
 import org.springframework.boot.actuate.endpoint.annotation.Selector;
 import org.springframework.boot.actuate.endpoint.annotation.Selector.Match;
 import org.springframework.boot.actuate.endpoint.annotation.WriteOperation;
-import org.springframework.boot.actuate.endpoint.http.ApiVersion;
 import org.springframework.boot.actuate.endpoint.invoke.OperationInvokerAdvisor;
 import org.springframework.boot.actuate.endpoint.invoke.convert.ConversionServiceParameterValueMapper;
 import org.springframework.boot.actuate.endpoint.web.Link;
diff --git a/spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesHints.java b/spring-native-configuration/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesHints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-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.
@@ -16,7 +16,7 @@
 
 package org.springframework.boot.autoconfigure.data.elasticsearch;
 
-import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.xcontent.XContentParser;
 
 import org.springframework.boot.autoconfigure.data.SpringDataReactiveHints;
 import org.springframework.data.elasticsearch.core.event.AfterConvertCallback;
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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-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.
@@ -24,7 +24,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.springframework.boot.autoconfigure.hateoas.HypermediaHttpMessageConverterConfiguration;
 import org.springframework.boot.autoconfigure.jackson.JacksonHints;
 import org.springframework.hateoas.Affordance;
 import org.springframework.hateoas.AffordanceModel;
diff --git a/spring-native-docs/src/main/asciidoc/attributes.adoc b/spring-native-docs/src/main/asciidoc/attributes.adoc
@@ -26,7 +26,7 @@
 :graalvm-native-buildtools: https://github.com/graalvm/native-build-tools
 :graalvm-native-buildtools-version: 0.9.11
 
-:spring-boot-version: 2.6.6
+:spring-boot-version: 2.7.0-SNAPSHOT
 :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/
diff --git a/spring-native/src/main/java/org/springframework/aop/framework/ProxyGenerator.java b/spring-native/src/main/java/org/springframework/aop/framework/ProxyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 the original author or authors.
+ * Copyright 2019-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.
@@ -355,7 +355,7 @@ private static class AuxiliaryTypeNamingStrategy implements AuxiliaryType.Naming
 		public AuxiliaryTypeNamingStrategy() {}
 
 		@Override
-		public String name(TypeDescription instrumentedType) {
+		public String name(TypeDescription instrumentedType, AuxiliaryType auxiliaryType) {
 			return instrumentedType.getName()+"$aux$"+Integer.toHexString(counter++);
 		}
 	}
diff --git a/spring-native/src/main/java/org/springframework/aot/test/boot/AotSpringBootConfigContextLoader.java b/spring-native/src/main/java/org/springframework/aot/test/boot/AotSpringBootConfigContextLoader.java
@@ -33,6 +33,7 @@
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.test.context.MergedContextConfiguration;
 import org.springframework.test.context.SmartContextLoader;
 import org.springframework.test.context.support.TestPropertySourceUtils;
@@ -115,6 +116,10 @@ else if (this.webApplicationType == WebApplicationType.REACTIVE) {
 		return context;
 	}
 
+	protected ConfigurableEnvironment getEnvironment() {
+		return new StandardEnvironment();
+	}
+
 	private boolean isEmbeddedWebEnvironment() {
 		return this.webEnvironment.isEmbedded();
 	}

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.6.6' apply false`
	`3`	`+ id 'org.springframework.boot' version '2.7.0-SNAPSHOT' apply false`
`4`	`4`	`id 'org.springframework.experimental.aot' version '0.12.0-SNAPSHOT' apply false`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2019-2021 the original author or authors.`
	`2`	`+ * Copyright 2019-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2021 the original author or authors.`
	`2`	`+ * Copyright 2019-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -355,7 +355,7 @@ private static class AuxiliaryTypeNamingStrategy implements AuxiliaryType.Naming`
`355`	`355`	`public AuxiliaryTypeNamingStrategy() {}`
`356`	`356`
`357`	`357`	`@Override`
`358`		`- public String name(TypeDescription instrumentedType) {`
	`358`	`+ public String name(TypeDescription instrumentedType, AuxiliaryType auxiliaryType) {`
`359`	`359`	`return instrumentedType.getName()+"$aux$"+Integer.toHexString(counter++);`
`360`	`360`	`}`
`361`	`361`	`}`