From f2aa29e8969fce632abd93045c7dc4a7de5e6d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Kreileder?= Date: Mon, 26 Sep 2022 18:28:25 +0200 Subject: [PATCH 1/2] Move auto-configuration registrations from spring.factories to spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports --- .../src/main/resources/META-INF/spring.factories | 12 ------------ ...work.boot.autoconfigure.AutoConfiguration.imports | 11 +++++++++++ ...ork.boot.autoconfigure.AutoConfiguration.imports} | 5 ++--- .../src/main/resources/META-INF/spring.factories | 5 ----- ...work.boot.autoconfigure.AutoConfiguration.imports | 4 ++++ ...ork.boot.autoconfigure.AutoConfiguration.imports} | 5 ++--- .../src/main/resources/META-INF/spring.factories | 5 ----- ...work.boot.autoconfigure.AutoConfiguration.imports | 4 ++++ 8 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories create mode 100644 springdoc-openapi-starter-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (59%) delete mode 100644 springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring.factories create mode 100644 springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/{spring.factories => spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports} (60%) delete mode 100644 springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring.factories create mode 100644 springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2a54fe1dc..000000000 --- a/springdoc-openapi-starter-common/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,12 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springdoc.core.configuration.SpringDocConfiguration,\ -org.springdoc.core.properties.SpringDocConfigProperties,\ -org.springdoc.core.configuration.SpringDocJavadocConfiguration,\ -org.springdoc.core.configuration.SpringDocGroovyConfiguration,\ -org.springdoc.core.configuration.SpringDocSecurityConfiguration,\ -org.springdoc.core.configuration.SpringDocFunctionCatalogConfiguration,\ -org.springdoc.core.configuration.SpringDocHints,\ -org.springdoc.core.configuration.SpringDocHateoasConfiguration,\ -org.springdoc.core.configuration.SpringDocPageableConfiguration,\ -org.springdoc.core.configuration.SpringDocSortConfiguration,\ -org.springdoc.core.configuration.SpringDocDataRestConfiguration \ No newline at end of file diff --git a/springdoc-openapi-starter-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..0bbadc632 --- /dev/null +++ b/springdoc-openapi-starter-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,11 @@ +org.springdoc.core.configuration.SpringDocConfiguration +org.springdoc.core.properties.SpringDocConfigProperties +org.springdoc.core.configuration.SpringDocJavadocConfiguration +org.springdoc.core.configuration.SpringDocGroovyConfiguration +org.springdoc.core.configuration.SpringDocSecurityConfiguration +org.springdoc.core.configuration.SpringDocFunctionCatalogConfiguration +org.springdoc.core.configuration.SpringDocHints +org.springdoc.core.configuration.SpringDocHateoasConfiguration +org.springdoc.core.configuration.SpringDocPageableConfiguration +org.springdoc.core.configuration.SpringDocSortConfiguration +org.springdoc.core.configuration.SpringDocDataRestConfiguration diff --git a/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 59% rename from springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring.factories rename to springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 71597e281..6f61e7590 100644 --- a/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring.factories +++ b/springdoc-openapi-starter-webflux-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springdoc.webflux.core.configuration.SpringDocWebFluxConfiguration,\ -org.springdoc.webflux.core.configuration.MultipleOpenApiSupportConfiguration \ No newline at end of file +org.springdoc.webflux.core.configuration.SpringDocWebFluxConfiguration +org.springdoc.webflux.core.configuration.MultipleOpenApiSupportConfiguration diff --git a/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring.factories deleted file mode 100644 index eaf933679..000000000 --- a/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,5 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springdoc.webflux.ui.SwaggerConfig,\ -org.springdoc.core.properties.SwaggerUiConfigProperties,\ -org.springdoc.core.properties.SwaggerUiConfigParameters,\ -org.springdoc.core.properties.SwaggerUiOAuthProperties \ No newline at end of file diff --git a/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..cf6ae68b1 --- /dev/null +++ b/springdoc-openapi-starter-webflux-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +org.springdoc.webflux.ui.SwaggerConfig +org.springdoc.core.properties.SwaggerUiConfigProperties +org.springdoc.core.properties.SwaggerUiConfigParameters +org.springdoc.core.properties.SwaggerUiOAuthProperties diff --git a/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 60% rename from springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring.factories rename to springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 8af944a1d..3a7c15774 100644 --- a/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring.factories +++ b/springdoc-openapi-starter-webmvc-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springdoc.webmvc.core.configuration.SpringDocWebMvcConfiguration,\ -org.springdoc.webmvc.core.configuration.MultipleOpenApiSupportConfiguration \ No newline at end of file +org.springdoc.webmvc.core.configuration.SpringDocWebMvcConfiguration +org.springdoc.webmvc.core.configuration.MultipleOpenApiSupportConfiguration diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring.factories b/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 2ea346084..000000000 --- a/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,5 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springdoc.webmvc.ui.SwaggerConfig,\ -org.springdoc.core.properties.SwaggerUiConfigProperties,\ -org.springdoc.core.properties.SwaggerUiConfigParameters,\ -org.springdoc.core.properties.SwaggerUiOAuthProperties \ No newline at end of file diff --git a/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..564d7a2e5 --- /dev/null +++ b/springdoc-openapi-starter-webmvc-ui/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +org.springdoc.webmvc.ui.SwaggerConfig +org.springdoc.core.properties.SwaggerUiConfigProperties +org.springdoc.core.properties.SwaggerUiConfigParameters +org.springdoc.core.properties.SwaggerUiOAuthProperties From 1a379480b83a2554527d82f0eec65c9be0c46a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Kreileder?= Date: Mon, 26 Sep 2022 18:28:48 +0200 Subject: [PATCH 2/2] spring-boot-starter-parent 3.0.0-M5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d528d6bdf..bd6f2c2e9 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-M4 + 3.0.0-M5