RESTEASY-3226 Adapt to new auto configuration support in spring boot …

…3.0.0-M5

pom.xml

@@ -29,7 +29,7 @@
         <resteasy.jackson.version>2.12.3</resteasy.jackson.version>
         <resteasy.spring.version>3.0.0.Beta1</resteasy.spring.version>
         <resteasy.version>6.1.0.Final</resteasy.version>
-        <springboot.version>3.0.0-M4</springboot.version>
+        <springboot.version>3.0.0-M5</springboot.version>
         <slf4j.version>1.7.36</slf4j.version>
         <ver.mockito>4.3.1</ver.mockito>
         <ver.objenesis>3.2</ver.objenesis>
@@ -38,7 +38,7 @@
         <version.glassfish.jakarta.el>5.0.0-M1</version.glassfish.jakarta.el>
         <version.jakarta.ws.rs>3.1.0</version.jakarta.ws.rs>
         <version.jakarta.inject.api>2.0.1</version.jakarta.inject.api>
-        <version.org.springframework>6.0.0-M4</version.org.springframework>
+        <version.org.springframework>6.0.0-M6</version.org.springframework>
         <ver.jakarta.validation-api>3.0.1</ver.jakarta.validation-api>
         <version.org.eclipse>2.0.4</version.org.eclipse>
         <ver.wildfly.maven.plugin>3.0.0.Final</ver.wildfly.maven.plugin>

reactor-netty/resteasy-reactor-netty-spring-boot-starter/src/main/java/org/jboss/resteasy/springboot/reactor/ResteasyAutoConfiguration.java

@@ -13,9 +13,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.env.Environment;
 
@@ -28,7 +28,7 @@
 /**
  * This is the main class that prepares a Resteasy deployment and starts a Reactor Netty server.
  */
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties
 public class ResteasyAutoConfiguration {
 

reactor-netty/resteasy-reactor-netty-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.jboss.resteasy.springboot.reactor.ResteasyAutoConfiguration

servlet/resteasy-servlet-spring-boot-starter/src/main/java/org/jboss/resteasy/springboot/ResteasyAutoConfiguration.java

@@ -16,19 +16,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * This is the main class that configures this Resteasy Sring Boot starter
  *
  * @author Fabio Carvalho ([email protected] or [email protected])
  */
-@Configuration
-@AutoConfigureAfter(WebMvcAutoConfiguration.class)
+@AutoConfiguration(after = WebMvcAutoConfiguration.class)
 @EnableConfigurationProperties
 public class ResteasyAutoConfiguration {
 
@@ -38,13 +36,13 @@ public class ResteasyAutoConfiguration {
     /**
      * This is a modified version of {@link ResteasyBootstrap}
      * @param resteasySpringBeanProcessor - A bean processor for Resteasy.
-     * 
+     *
      * @return a ServletContextListener object that configures and start a ResteasyDeployment
      */
     @Bean
     public ServletContextListener resteasyBootstrapListener(
             final @Qualifier("resteasySpringBeanProcessor") SpringBeanProcessor resteasySpringBeanProcessor) {
-        
+
         ServletContextListener servletContextListener = new ServletContextListener() {
 
             protected ResteasyDeployment deployment;
@@ -83,7 +81,7 @@ public ResteasyApplicationBuilder resteasyApplicationBuilder() {
     public static ResteasyBeanProcessorTomcat resteasyBeanProcessorTomcat() {
         return new ResteasyBeanProcessorTomcat();
     }
-    
+
     @Bean("resteasySpringBeanProcessor")
     public static SpringBeanProcessor resteasySpringBeanProcessor() {
         return ResteasyBeanProcessorFactory.resteasySpringBeanProcessor();

servlet/resteasy-servlet-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+org.jboss.resteasy.springboot.ResteasyAutoConfiguration