diff --git a/pom.xml b/pom.xml index 3205d227a13..688e3a8dced 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 0.8.12 7.0.0.202409031743-r 1.3.0 - 2.6.0 + 2.6.0 1.2.1 5.0.0.4389 2.18.0 @@ -142,13 +142,13 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi-starter-webmvc-ui.version} + ${springdoc-openapi.version} org.springdoc springdoc-openapi-starter-webmvc-api - ${springdoc-openapi-starter-webmvc-ui.version} + ${springdoc-openapi.version} diff --git a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoccore/domain/SpringdocModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoccore/domain/SpringdocModuleFactory.java index 7491442ddb0..bb07509978a 100644 --- a/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoccore/domain/SpringdocModuleFactory.java +++ b/src/main/java/tech/jhipster/lite/generator/server/springboot/apidocumentation/springdoccore/domain/SpringdocModuleFactory.java @@ -70,31 +70,30 @@ private JHipsterModule buildModule(JHipsterModuleProperties properties, SpringDo private record SpringDocDependencies(JavaDependency ui, JavaDependency api) { private static final String SPRINGDOC_GROUP_ID = "org.springdoc"; - private static final String SPRINGDOC_OPENAPI_WEBMVC_VERSION_KEY = "springdoc-openapi-starter-webmvc"; - private static final String SPRINGDOC_OPENAPI_WEBFLUX_VERSION_KEY = "springdoc-openapi-starter-webflux"; + private static final String SPRINGDOC_OPENAPI_VERSION_KEY = "springdoc-openapi"; private static final JavaDependency MVC_UI_DEPENDENCY = JavaDependency.builder() .groupId(SPRINGDOC_GROUP_ID) .artifactId("springdoc-openapi-starter-webmvc-ui") - .versionSlug(SPRINGDOC_OPENAPI_WEBMVC_VERSION_KEY) + .versionSlug(SPRINGDOC_OPENAPI_VERSION_KEY) .build(); private static final JavaDependency MVC_API_DEPENDENCY = JavaDependency.builder() .groupId(SPRINGDOC_GROUP_ID) .artifactId("springdoc-openapi-starter-webmvc-api") - .versionSlug(SPRINGDOC_OPENAPI_WEBMVC_VERSION_KEY) + .versionSlug(SPRINGDOC_OPENAPI_VERSION_KEY) .build(); private static final JavaDependency WEBFLUX_UI_DEPENDENCY = JavaDependency.builder() .groupId(SPRINGDOC_GROUP_ID) .artifactId("springdoc-openapi-starter-webflux-ui") - .versionSlug(SPRINGDOC_OPENAPI_WEBFLUX_VERSION_KEY) + .versionSlug(SPRINGDOC_OPENAPI_VERSION_KEY) .build(); private static final JavaDependency WEBFLUX_API_DEPENDENCY = JavaDependency.builder() .groupId(SPRINGDOC_GROUP_ID) .artifactId("springdoc-openapi-starter-webflux-api") - .versionSlug(SPRINGDOC_OPENAPI_WEBFLUX_VERSION_KEY) + .versionSlug(SPRINGDOC_OPENAPI_VERSION_KEY) .build(); private static final SpringDocDependencies MVC = new SpringDocDependencies(MVC_UI_DEPENDENCY, MVC_API_DEPENDENCY); diff --git a/src/main/resources/generator/dependencies/pom.xml b/src/main/resources/generator/dependencies/pom.xml index ac776e5ce11..83de7ae9e80 100644 --- a/src/main/resources/generator/dependencies/pom.xml +++ b/src/main/resources/generator/dependencies/pom.xml @@ -19,8 +19,7 @@ 3.3.5 2023.0.4 4.1.4 - 2.6.0 - 2.6.0 + 2.6.0 3.9.0 5.5.0 2.14.1 @@ -118,22 +117,22 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - ${springdoc-openapi-starter-webmvc.version} + ${springdoc-openapi.version} org.springdoc springdoc-openapi-starter-webmvc-api - ${springdoc-openapi-starter-webmvc.version} + ${springdoc-openapi.version} org.springdoc springdoc-openapi-starter-webflux-ui - ${springdoc-openapi-starter-webflux.version} + ${springdoc-openapi.version} org.springdoc springdoc-openapi-starter-webflux-api - ${springdoc-openapi-starter-webflux.version} + ${springdoc-openapi.version} org.springframework.boot