Upgrade to:

- spring-boot 3.0.0-M5
- swagger-core 2.2.3
- webjars-locator-core 0.52
- spring-cloud-function 4.0.0-M5

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.0-M4</version>
+		<version>3.0.0-M5</version>
 	</parent>
 
 	<licenses>
@@ -61,17 +61,16 @@
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
 		<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
-		<swagger-api.version>2.2.2</swagger-api.version>
-		<swagger-ui.version>4.14.0</swagger-ui.version>
+		<swagger-api.version>2.2.3</swagger-api.version>
+		<swagger-ui.version>4.14.3</swagger-ui.version>
 		<classgraph.version>4.8.149</classgraph.version>
-		<webjars-locator-core.version>0.50</webjars-locator-core.version>
+		<webjars-locator-core.version>0.52</webjars-locator-core.version>
 		<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
 		<jaxb-impl.version>2.1</jaxb-impl.version>
 		<javax.jws-api.version>1.1</javax.jws-api.version>
 		<jjwt.version>0.9.1</jjwt.version>
-		<spring-native.version>0.12.1</spring-native.version>
 		<therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
-		<spring-cloud-function.version>4.0.0-M3</spring-cloud-function.version>
+		<spring-cloud-function.version>4.0.0-M5</spring-cloud-function.version>
 	</properties>
 
 	<dependencyManagement>
@@ -125,11 +124,6 @@
 				<version>${jjwt.version}</version>
 				<scope>test</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.experimental</groupId>
-				<artifactId>spring-native</artifactId>
-				<version>${spring-native.version}</version>
-			</dependency>
 			<!-- spring Cloud -->
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
@@ -335,5 +329,13 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
+		<pluginRepository>
+			<id>spring-milestone</id>
+			<name>Spring milestone</name>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
 	</pluginRepositories>
 </project>

springdoc-openapi-starter-common/pom.xml

@@ -72,12 +72,6 @@
 			<artifactId>kotlinx-coroutines-reactor</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<!-- Spring Native -->
-		<dependency>
-			<groupId>org.springframework.experimental</groupId>
-			<artifactId>spring-native</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<!-- Spring Web /Data Rest/Hateoas && For Enhanced Pageable Support-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app26.json

@@ -44,12 +44,36 @@
   },
   "components": {
     "schemas": {
+      "Bar": {
+        "type": "object",
+        "properties": {
+          "bar": {
+            "type": "string"
+          }
+        }
+      },
+      "Foo": {
+        "type": "object",
+        "properties": {
+          "foo": {
+            "type": "string"
+          }
+        }
+      },
       "MyModel": {
         "type": "object",
         "properties": {
           "thing": {
             "type": "object",
-            "description": "Hello"
+            "description": "Hello",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/Foo"
+              },
+              {
+                "$ref": "#/components/schemas/Bar"
+              }
+            ]
           }
         }
       }

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app11/WebSecurityConf.java

@@ -1,11 +1,13 @@
 package test.org.springdoc.ui.app11;
 
+import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 
 @EnableWebSecurity
+@Configuration
 public class WebSecurityConf extends WebSecurityConfigurerAdapter {
 
 	@Override

springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app301/SpringDocApp301Test.java

@@ -72,7 +72,7 @@ void init() throws IllegalAccessException {
 	}
 
 	@AfterEach
-	private void clean() throws IllegalAccessException {
+	void clean() throws IllegalAccessException {
 		Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
 		SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
 		Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app9/SpringDocApp9Test.java

@@ -72,7 +72,7 @@ void init() throws IllegalAccessException {
 	}
 
 	@AfterEach
-	private void clean() throws IllegalAccessException {
+	void clean() throws IllegalAccessException {
 		Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
 		SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
 		Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/app6/SpringDocApp6Test.java

@@ -73,7 +73,7 @@ void init() throws IllegalAccessException {
 	}
 
 	@AfterEach
-	private void clean() throws IllegalAccessException {
+	void clean() throws IllegalAccessException {
 		Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
 		SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
 		Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/app8/SpringDocApp8Test.java

@@ -72,7 +72,7 @@ void init() throws IllegalAccessException {
 	}
 
 	@AfterEach
-	private void clean() throws IllegalAccessException {
+	void clean() throws IllegalAccessException {
 		Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
 		SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
 		Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/app26.json

@@ -53,16 +53,44 @@
   },
   "components": {
     "schemas": {
+      "Bar": {
+        "type": "object",
+        "properties": {
+          "bar": {
+            "type": "string",
+            "description": "The Bar."
+          }
+        },
+        "description": "The type Bar."
+      },
+      "Foo": {
+        "type": "object",
+        "properties": {
+          "foo": {
+            "type": "string",
+            "description": "The Foo."
+          }
+        },
+        "description": "The type Foo."
+      },
       "MyModel": {
         "type": "object",
         "properties": {
           "thing": {
             "type": "object",
-            "description": "Hello"
+            "description": "Hello",
+            "oneOf": [
+              {
+                "$ref": "#/components/schemas/Foo"
+              },
+              {
+                "$ref": "#/components/schemas/Bar"
+              }
+            ]
           }
         },
         "description": "The type My model."
       }
     }
   }
-}
+}

springdoc-openapi-tests/springdoc-openapi-native-tests/pom.xml

@@ -7,34 +7,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>springdoc-openapi-native-tests</artifactId>
 	<dependencies>
-		<dependency>
-			<groupId>org.springframework.experimental</groupId>
-			<artifactId>spring-native</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
 			<version>${project.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.experimental</groupId>
-				<artifactId>spring-aot-maven-plugin</artifactId>
-				<version>${spring-native.version}</version>
-				<!-- TODO, waiting for spring-native compatibility with spring-boot 3.0.0-M1-->
-				<!-- executions>
-					<execution>
-						<id>test-generate</id>
-						<goals>
-							<goal>test-generate</goal>
-						</goals>
-					</execution>
-				</executions -->
-			</plugin>
-		</plugins>
-	</build>
 </project>

springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/app6/security/WebSecurity.java

@@ -24,6 +24,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -38,7 +39,7 @@
 
 import static org.springdoc.core.utils.Constants.ALL_PATTERN;
 
-
+@Configuration
 @EnableWebSecurity
 @Order(200)
 public class WebSecurity extends WebSecurityConfigurerAdapter {

springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/app8/security/WebConfig.java

@@ -1,10 +1,12 @@
 package test.org.springdoc.api.app8.security;
 
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
+@Configuration
 @EnableWebSecurity
 @Order(200)
 public class WebConfig extends WebSecurityConfigurerAdapter {

springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/app9/WebConfig.java

@@ -1,10 +1,12 @@
 package test.org.springdoc.api.app9;
 
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
+@Configuration
 @EnableWebSecurity
 @Order(200)
 public class WebConfig extends WebSecurityConfigurerAdapter {