Merge pull request #11488 from murdos/simplify-springdoc-openapi-vers…

…ions chore(deps): simplify springdoc-openapi versions
jhipster · Dec 2, 2024 · 2c29930 · 2c29930
2 parents d64360f + 6c4983d
commit 2c29930
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -66,7 +66,7 @@
     <jacoco.version>0.8.12</jacoco.version>
     <jgit.version>7.0.0.202409031743-r</jgit.version>
     <archunit-junit5.version>1.3.0</archunit-junit5.version>
-    <springdoc-openapi-starter-webmvc-ui.version>2.6.0</springdoc-openapi-starter-webmvc-ui.version>
+    <springdoc-openapi.version>2.6.0</springdoc-openapi.version>
     <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
     <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
     <apache-commons-io.version>2.18.0</apache-commons-io.version>
@@ -142,13 +142,13 @@
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-      <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
+      <version>${springdoc-openapi.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.springdoc</groupId>
       <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-      <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
+      <version>${springdoc-openapi.version}</version>
     </dependency>
 
     <dependency>

diff --git a/...rator/server/springboot/apidocumentation/springdoccore/domain/SpringdocModuleFactory.java b/...rator/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
@@ -19,8 +19,7 @@
     <spring-boot.version>3.3.5</spring-boot.version>
     <spring-cloud.version>2023.0.4</spring-cloud.version>
     <spring-cloud-netflix-eureka-client.version>4.1.4</spring-cloud-netflix-eureka-client.version>
-    <springdoc-openapi-starter-webmvc.version>2.6.0</springdoc-openapi-starter-webmvc.version>
-    <springdoc-openapi-starter-webflux.version>2.6.0</springdoc-openapi-starter-webflux.version>
+    <springdoc-openapi.version>2.6.0</springdoc-openapi.version>
     <kafka-clients.version>3.9.0</kafka-clients.version>
     <mongock.version>5.5.0</mongock.version>
     <neo4j-migrations.version>2.14.1</neo4j-migrations.version>
@@ -118,22 +117,22 @@
       <dependency>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-        <version>${springdoc-openapi-starter-webmvc.version}</version>
+        <version>${springdoc-openapi.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-        <version>${springdoc-openapi-starter-webmvc.version}</version>
+        <version>${springdoc-openapi.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
-        <version>${springdoc-openapi-starter-webflux.version}</version>
+        <version>${springdoc-openapi.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-starter-webflux-api</artifactId>
-        <version>${springdoc-openapi-starter-webflux.version}</version>
+        <version>${springdoc-openapi.version}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>