generator-jhipster 8.6.0 → 8.7.0

package/dist/generators/server/jdl/application-definition.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { upperCase, snakeCase } from 'lodash-es';
+import { snakeCase, upperCase } from 'lodash-es';
 import databaseMigrationOption from '../options/database-migration.js';
 import messageBrokerOption from '../options/message-broker.js';
 import { feignClientDefinition, syncUserWithIdpDefinition } from '../options/index.js';

package/dist/generators/server/resources/Dockerfile

@@ -10,20 +10,20 @@ LABEL ALIAS=jhipster-control-center
 FROM jhipster/consul-config-loader:v0.4.1
 LABEL ALIAS=consul-config-loader
 
-FROM postgres:16.3
+FROM postgres:16.4
 LABEL ALIAS=postgresql
 
 FROM quay.io/keycloak/keycloak:25.0.1
 LABEL ALIAS=keycloak
 
-FROM mysql:8.4.0
+FROM mysql:9.0.1
 
-FROM mariadb:11.4.2
+FROM mariadb:11.5.2
 
 FROM mongo:7.0.6
 LABEL ALIAS=mongodb
 
-FROM couchbase/server:7.6.1
+FROM couchbase/server:7.6.2
 LABEL ALIAS=couchbase
 
 FROM cassandra:5.0
@@ -31,31 +31,31 @@ FROM cassandra:5.0
 FROM mcr.microsoft.com/mssql/server:2019-CU16-GDR1-ubuntu-20.04
 LABEL ALIAS=mssql
 
-FROM neo4j:5.20.0
+FROM neo4j:5.23.0
 
-FROM hazelcast/management-center:5.4.1
+FROM hazelcast/management-center:5.5.1
 LABEL ALIAS=hazelcast
 
-FROM memcached:1.6.28-alpine
+FROM memcached:1.6.29-alpine
 
-FROM redis:7.2.5
+FROM redis:7.4.0
 
-FROM confluentinc/cp-kafka:7.6.1
+FROM confluentinc/cp-kafka:7.7.0
 LABEL ALIAS=kafka
 
-FROM confluentinc/cp-zookeeper:7.6.1
+FROM confluentinc/cp-zookeeper:7.7.0
 LABEL ALIAS=zookeeper
 
-FROM apachepulsar/pulsar:3.2.3
+FROM apachepulsar/pulsar:3.3.1
 LABEL ALIAS=pulsar
 
-FROM sonarqube:10.5.1-community
+FROM sonarqube:10.6.0-community
 LABEL ALIAS=sonar
 
-FROM docker.io/bitnami/consul:1.19.0
+FROM docker.io/bitnami/consul:1.19.1
 LABEL ALIAS=consul
 
-FROM prom/prometheus:v2.53.0
+FROM prom/prometheus:v2.54.0
 LABEL ALIAS=prometheus
 
 FROM prom/alertmanager:v0.27.0
@@ -64,7 +64,7 @@ LABEL ALIAS=prometheus-alertmanager
 FROM quay.io/coreos/prometheus-operator:v0.42.1
 LABEL ALIAS=prometheus-operator
 
-FROM grafana/grafana:11.0.0
+FROM grafana/grafana:11.1.4
 LABEL ALIAS=grafana
 
 FROM quay.io/coreos/grafana-watcher:v0.0.8

package/dist/generators/server/resources/gradle/libs.versions.toml

@@ -1,38 +1,42 @@
 [libraries]
-spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.2' }
+spring-cloud-dependencies = { module = 'org.springframework.cloud:spring-cloud-dependencies', version = '2023.0.3' }
 
-springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.5.0' }
+springdoc = { module = 'org.springdoc:springdoc-openapi-starter-webmvc-api', version = '2.6.0' }
 
 feign-reactor-bom = { module = 'com.playtika.reactivefeign:feign-reactor-bom', version = '4.0.3' }
 
 # Cucumber
 testng = { module = 'org.testng:testng', version = '7.10.2' }
-cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.0' }
+cucumber-bom = { module = 'io.cucumber:cucumber-bom', version = '7.18.1' }
 
 mongock-bom = { module = 'io.mongock:mongock-bom', version = '5.4.4' }
 
-neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.10.3' }
+neo4j-migrations-spring-boot-starter = { module = 'eu.michael-simons.neo4j:neo4j-migrations-spring-boot-starter', version = '2.12.0' }
 
 # Cassandra
 lz4-java = { module = 'org.lz4:lz4-java', version = '1.8.0' }
 
+# jib
+jib-maven-plugin = { module = 'com.google.cloud.tools:jib-maven-plugin', version = '3.4.3' }
+jib-spring-boot-extension-maven = { module = 'com.google.cloud.tools:jib-spring-boot-extension-maven', version = '0.1.0' }
+
 [plugins]
 gradle-git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.2' }
 
 node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.2' }
 
-gradle-liquibase = { id = 'org.liquibase.gradle', version = '2.2.2' }
+gradle-liquibase = { id = 'org.liquibase.gradle', version = '3.0.0' }
 
-gradle-sonarqube = { id = 'org.sonarqube', version = '5.0.0.4638' }
+gradle-sonarqube = { id = 'org.sonarqube', version = '5.1.0.4882' }
 
 spotless-gradle-plugin = { id = 'com.diffplug.spotless', version = '6.25.0' }
 
-gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.2' }
+gradle-modernizer-plugin = { id = 'com.github.andygoossens.gradle-modernizer-plugin', version = '1.9.3' }
 
-gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.17.5' }
+gradle-enterprise = { id = 'com.gradle.enterprise', version = '3.18' }
 
 common-custom-user-data-gradle-plugin = { id = 'com.gradle.common-custom-user-data-gradle-plugin', version = '2.0.2' }
 
-gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.4' }
+gatling-gradle = { id = 'io.gatling.gradle', version = '3.11.5.2' }
 
-gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.5.0' }
+gradle-openapi-generator = { id = 'org.openapi.generator', version = '7.8.0' }

package/dist/generators/server/resources/pom.xml

@@ -11,36 +11,35 @@
         <archunit-junit5.version>1.3.0</archunit-junit5.version>
         <blockhound-junit-platform.version>1.0.9.RELEASE</blockhound-junit-platform.version>
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <gatling.version>3.11.4</gatling.version>
+        <gatling.version>3.11.5</gatling.version>
         <jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
-        <mapstruct.version>1.5.5.Final</mapstruct.version>
+        <mapstruct.version>1.6.0</mapstruct.version>
         <micrometer-context-propagation.version>1.1.1</micrometer-context-propagation.version>
         <picocli.version>4.7.6</picocli.version>
 
         <!-- Plugin versions -->
-        <checkstyle.version>10.17.0</checkstyle.version>
+        <checkstyle.version>10.18.0</checkstyle.version>
         <checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
         <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
-        <gatling-maven-plugin.version>4.9.4</gatling-maven-plugin.version>
-        <git-commit-id-maven-plugin.version>9.0.0</git-commit-id-maven-plugin.version>
-        <jib-maven-plugin.version>3.4.3</jib-maven-plugin.version>
+        <gatling-maven-plugin.version>4.9.6</gatling-maven-plugin.version>
+        <git-commit-id-maven-plugin.version>9.0.1</git-commit-id-maven-plugin.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
         <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-        <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
+        <maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-        <maven-failsafe-plugin.version>3.3.0</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>3.4.0</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
-        <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-        <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
-        <maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
+        <maven-site-plugin.version>3.20.0</maven-site-plugin.version>
+        <maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <modernizer-maven-plugin.version>2.9.0</modernizer-maven-plugin.version>
         <nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
-        <openapi-generator-maven-plugin.version>7.6.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.8.0</openapi-generator-maven-plugin.version>
         <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
         <sonar-maven-plugin.version>4.0.0.4121</sonar-maven-plugin.version>
         <spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
@@ -98,11 +97,6 @@
                   <artifactId>frontend-maven-plugin</artifactId>
                   <version>${frontend-maven-plugin.version}</version>
                 </plugin>
-                <plugin>
-                  <groupId>com.google.cloud.tools</groupId>
-                  <artifactId>jib-maven-plugin</artifactId>
-                  <version>${jib-maven-plugin.version}</version>
-                </plugin>
                 <plugin>
                   <groupId>com.puppycrawl.tools</groupId>
                   <artifactId>checkstyle</artifactId>

package/dist/generators/server/support/config.js

@@ -1,5 +1,5 @@
 import { mutateData, normalizePathEnd, pickFields } from '../../base/support/index.js';
-import { databaseTypes, monitoringTypes, authenticationTypes, buildToolTypes, cacheTypes, websocketTypes, serviceDiscoveryTypes, searchEngineTypes, } from '../../../jdl/jhipster/index.js';
+import { authenticationTypes, buildToolTypes, cacheTypes, databaseTypes, monitoringTypes, searchEngineTypes, serviceDiscoveryTypes, websocketTypes, } from '../../../jdl/jhipster/index.js';
 import { prepareSqlApplicationProperties } from '../../spring-data-relational/support/index.js';
 import { CLIENT_DIST_DIR, CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, } from '../../generator-constants.js';
 import { MESSAGE_BROKER_KAFKA, MESSAGE_BROKER_NO, MESSAGE_BROKER_PULSAR } from '../../server/options/index.js';

package/dist/generators/server/support/database.js

@@ -18,8 +18,8 @@
  */
 import crypto from 'crypto';
 import { databaseTypes, fieldTypes } from '../../../jdl/jhipster/index.js';
-import { hibernateSnakeCase } from './string.js';
 import { databaseData } from '../../spring-data-relational/support/index.js';
+import { hibernateSnakeCase } from './string.js';
 const dbTypes = fieldTypes;
 const { STRING: TYPE_STRING, LONG: TYPE_LONG, UUID: TYPE_UUID } = dbTypes.CommonDBTypes;
 const { MONGODB, NEO4J, COUCHBASE, CASSANDRA, SQL } = databaseTypes;

package/dist/generators/server/support/prepare-entity.js

@@ -20,9 +20,9 @@ import path from 'path';
 import { databaseTypes, searchEngineTypes } from '../../../jdl/jhipster/index.js';
 import { isReservedTableName } from '../../../jdl/jhipster/reserved-keywords.js';
 import { mutateData, normalizePathEnd } from '../../base/support/index.js';
+import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
 import { hibernateSnakeCase } from './string.js';
 import { getDatabaseTypeData } from './database.js';
-import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
 const { NO: NO_SEARCH_ENGINE, ELASTICSEARCH } = searchEngineTypes;
 const { POSTGRESQL, MYSQL, MARIADB, COUCHBASE, SQL, NEO4J } = databaseTypes;
 export default function prepareEntity(entity) {

package/dist/generators/server/support/prepare-field.js

@@ -19,10 +19,10 @@
 import assert from 'assert';
 import { snakeCase, upperFirst } from 'lodash-es';
 import { databaseTypes, entityOptions, fieldTypes, reservedKeywords } from '../../../jdl/jhipster/index.js';
-import { getUXConstraintName } from './database.js';
-import { getJavaValueGeneratorForType } from './templates/field-values.js';
 import { formatDocAsApiDescription, formatDocAsJavaDoc } from '../../java/support/doc.js';
 import { mutateData } from '../../base/support/config.js';
+import { getUXConstraintName } from './database.js';
+import { getJavaValueGeneratorForType } from './templates/field-values.js';
 const { isReservedTableName } = reservedKeywords;
 const { CommonDBTypes } = fieldTypes;
 const { MYSQL, SQL } = databaseTypes;

package/dist/generators/server/support/relationship.js

@@ -19,7 +19,6 @@
 import { addOtherRelationship } from '../../base-application/support/index.js';
 import { databaseTypes } from '../../../jdl/index.js';
 const { NO: NO_DATABASE, SQL, NEO4J } = databaseTypes;
-// eslint-disable-next-line import/prefer-default-export
 export const addEntitiesOtherRelationships = (entities) => {
     const result = { warning: [] };
     for (const entity of entities.filter(entity => !entity.builtIn)) {

package/dist/generators/server/support/spring-factories.js

@@ -1,5 +1,4 @@
 import properties from 'dot-properties';
-// eslint-disable-next-line import/prefer-default-export
 export const addSpringFactory = ({ key, value }) => content => {
     const obj = properties.parse(content ?? '');
     const oldContent = obj[key];

package/dist/generators/server/support/string.js

@@ -23,7 +23,6 @@
  * @see org.springframework.boot.orm.jpa.hibernate.SpringNamingStrategy
  * @returns hibernate SnakeCase in JHipster preferred style
  */
-// eslint-disable-next-line import/prefer-default-export
 export function hibernateSnakeCase(value) {
     let res = '';
     if (value) {

package/dist/generators/server/support/templates/field-values.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { fieldTypes, databaseTypes } from '../../../../jdl/jhipster/index.js';
+import { databaseTypes, fieldTypes } from '../../../../jdl/jhipster/index.js';
 const dbTypes = fieldTypes;
 const { STRING, UUID, LONG, INTEGER } = dbTypes.CommonDBTypes;
 const { SQL } = databaseTypes;

package/dist/generators/spring-boot/cleanup.js

@@ -16,15 +16,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import cleanupOauth2 from './cleanup-oauth2.js';
 import { JAVA_DOCKER_DIR } from '../generator-constants.js';
 import { asWritingTask } from '../base-application/support/task-type-inference.js';
+import cleanupOauth2 from './cleanup-oauth2.js';
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.
  */
 export default asWritingTask(function cleanupTask(taskParam) {
-    const { application } = taskParam;
+    const { application, control } = taskParam;
     if (application.authenticationTypeOauth2) {
         cleanupOauth2.call(this, taskParam);
     }
@@ -200,4 +200,7 @@ export default asWritingTask(function cleanupTask(taskParam) {
     if (this.isJhipsterVersionLessThan('8.4.0')) {
         this.removeFile(`${application.javaPackageSrcDir}config/LocaleConfiguration.java`);
     }
+    control.cleanupFiles({
+        '8.6.1': [[application.authenticationTypeOauth2, `${application.javaPackageSrcDir}security/oauth2/JwtGrantedAuthorityConverter.java`]],
+    });
 });

package/dist/generators/spring-boot/command.js

@@ -19,7 +19,7 @@
 import chalk from 'chalk';
 import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.js';
 import { createBase64Secret, createSecret } from '../base/support/secret.js';
-import { authenticationTypes, applicationTypes } from '../../jdl/index.js';
+import { applicationTypes, authenticationTypes } from '../../jdl/index.js';
 const { OAUTH2, SESSION, JWT } = authenticationTypes;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
 const command = {

package/dist/generators/spring-boot/entity-cleanup.js

@@ -24,7 +24,6 @@
  * @param {Object} application
  * @param {Object} entity
  */
-// eslint-disable-next-line import/prefer-default-export
 export function cleanupOldFiles({ application: { packageFolder, srcMainJava, srcTestJava, searchEngineElasticsearch }, entity: { entityClass, entityAbsoluteFolder }, }) {
     if (this.isJhipsterVersionLessThan('7.6.1')) {
         if (searchEngineElasticsearch) {

package/dist/generators/spring-boot/entity-files.js

@@ -19,10 +19,10 @@
 import fs from 'fs';
 import * as _ from 'lodash-es';
 import chalk from 'chalk';
-import { cleanupOldFiles } from './entity-cleanup.js';
-import { moveToJavaPackageSrcDir, javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock } from '../java/support/index.js';
+import { javaMainPackageTemplatesBlock, javaTestPackageTemplatesBlock, moveToJavaPackageSrcDir } from '../java/support/index.js';
 import { SERVER_TEST_SRC_DIR } from '../generator-constants.js';
 import { databaseTypes, entityOptions } from '../../jdl/jhipster/index.js';
+import { cleanupOldFiles } from './entity-cleanup.js';
 const { COUCHBASE, MONGODB, NEO4J, SQL } = databaseTypes;
 const { MapperTypes } = entityOptions;
 const { MAPSTRUCT } = MapperTypes;

package/dist/generators/spring-boot/files.js

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SERVER_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_TEST_SRC_DIR, SERVER_TEST_RES_DIR } from '../generator-constants.js';
+import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR } from '../generator-constants.js';
 import { addSectionsCondition, mergeSections } from '../base/support/index.js';
-import { moveToJavaPackageSrcDir, moveToJavaPackageTestDir, moveToSrcMainResourcesDir } from '../java/support/index.js';
+import { javaMainPackageTemplatesBlock, moveToJavaPackageSrcDir, moveToJavaPackageTestDir, moveToSrcMainResourcesDir, } from '../java/support/index.js';
 const imperativeConfigFiles = {
     imperativeFiles: [
         {
@@ -56,7 +56,7 @@ const oauth2Files = {
         {
             path: `${SERVER_MAIN_SRC_DIR}_package_/`,
             renameTo: moveToJavaPackageSrcDir,
-            templates: ['security/oauth2/AudienceValidator.java', 'security/oauth2/JwtGrantedAuthorityConverter.java'],
+            templates: ['security/oauth2/AudienceValidator.java'],
         },
         {
             path: `${SERVER_TEST_SRC_DIR}_package_/`,
@@ -233,14 +233,6 @@ const swaggerFiles = {
             renameTo: moveToJavaPackageSrcDir,
             templates: ['config/OpenApiConfiguration.java'],
         },
-        {
-            condition: generator => generator.buildToolGradle,
-            templates: ['gradle/swagger.gradle'],
-        },
-        {
-            path: SERVER_MAIN_RES_DIR,
-            templates: ['swagger/api.yml'],
-        },
     ],
 };
 /**
@@ -343,6 +335,10 @@ export const baseServerFiles = {
         },
     ],
     serverMicroservice: [
+        javaMainPackageTemplatesBlock({
+            condition: generator => generator.applicationTypeMicroservice,
+            templates: ['config/SpringDocConfiguration.java'],
+        }),
         {
             condition: generator => generator.applicationTypeMicroservice,
             path: SERVER_MAIN_RES_DIR,

package/dist/generators/spring-boot/generator.js

@@ -21,15 +21,15 @@ import chalk from 'chalk';
 import { sortedUniqBy } from 'lodash-es';
 import BaseApplicationGenerator from '../base-application/index.js';
 import { GENERATOR_CUCUMBER, GENERATOR_DOCKER, GENERATOR_FEIGN_CLIENT, GENERATOR_GATLING, GENERATOR_LANGUAGES, GENERATOR_SERVER, GENERATOR_SPRING_CACHE, GENERATOR_SPRING_CLOUD_STREAM, GENERATOR_SPRING_DATA_CASSANDRA, GENERATOR_SPRING_DATA_COUCHBASE, GENERATOR_SPRING_DATA_ELASTICSEARCH, GENERATOR_SPRING_DATA_MONGODB, GENERATOR_SPRING_DATA_NEO4J, GENERATOR_SPRING_DATA_RELATIONAL, GENERATOR_SPRING_WEBSOCKET, } from '../generator-list.js';
-import { serverFiles } from './files.js';
-import cleanupTask from './cleanup.js';
 import { ADD_SPRING_MILESTONE_REPOSITORY } from '../generator-constants.js';
 import { addSpringFactory, getJavaValueGeneratorForType, getPrimaryKeyValue, getSpecificationBuildForType, insertContentIntoApplicationProperties, javaBeanCase, } from '../server/support/index.js';
 import { generateKeyStore } from '../java/support/index.js';
 import { createNeedleCallback, mutateData } from '../base/support/index.js';
 import { APPLICATION_TYPE_MICROSERVICE, applicationTypes, cacheTypes, databaseTypes, fieldTypes, messageBrokerTypes, searchEngineTypes, testFrameworkTypes, websocketTypes, } from '../../jdl/index.js';
-import { writeFiles as writeEntityFiles } from './entity-files.js';
 import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js';
+import { writeFiles as writeEntityFiles } from './entity-files.js';
+import cleanupTask from './cleanup.js';
+import { serverFiles } from './files.js';
 import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS, NO: NO_CACHE } = cacheTypes;
 const { NO: NO_WEBSOCKET, SPRING_WEBSOCKET } = websocketTypes;
@@ -51,23 +51,8 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster('jhipster:java:build-tool');
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
     get prompting() {
         return this.asPromptingTaskGroup({
-            async promptCommand({ control }) {
-                if (control.existingProject && this.options.askAnswered !== true)
-                    return;
-                await this.promptCurrentJHipsterCommand();
-            },
             askForServerTestOpts,
             askForServerSideOpts,
             askForOptionalItems,
@@ -78,9 +63,6 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     }
     get configuring() {
         return this.asConfiguringTaskGroup({
-            async configureCommand() {
-                await this.configureCurrentJHipsterCommandConfig();
-            },
             checks() {
                 const config = this.jhipsterConfigWithDefaults;
                 if (config.enableHibernateCache && [NO_CACHE, MEMCACHED].includes(config.cacheProvider)) {
@@ -113,13 +95,16 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     get composing() {
         return this.asComposingTaskGroup({
             async composing() {
-                const { applicationType, databaseType, messageBroker, searchEngine, websocket, cacheProvider, skipClient, clientFramework, testFrameworks, feignClient, } = this.jhipsterConfigWithDefaults;
+                const { applicationType, databaseType, messageBroker, searchEngine, websocket, cacheProvider, skipClient, clientFramework, testFrameworks, feignClient, enableSwaggerCodegen, } = this.jhipsterConfigWithDefaults;
                 await this.composeWithJHipster(GENERATOR_DOCKER);
                 await this.composeWithJHipster('jhipster:java:jib');
                 await this.composeWithJHipster('jhipster:java:code-quality');
                 if (!skipClient && clientFramework !== 'no') {
                     await this.composeWithJHipster('jhipster:java:node');
                 }
+                if (enableSwaggerCodegen) {
+                    await this.composeWithJHipster('jhipster:java:openapi-generator');
+                }
                 if (applicationType === GATEWAY) {
                     await this.composeWithJHipster('jhipster:spring-cloud:gateway');
                 }
@@ -177,16 +162,6 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.COMPOSING_COMPONENT]() {
         return this.delegateTasksToBlueprint(() => this.composingComponent);
     }
-    get loading() {
-        return this.asLoadingTaskGroup({
-            async loadCommand({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.LOADING]() {
-        return this.delegateTasksToBlueprint(() => this.loading);
-    }
     get preparing() {
         return this.asPreparingTaskGroup({
             checksWebsocket({ application }) {
@@ -386,7 +361,7 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
             async writeFiles({ application }) {
                 return this.writeFiles({
                     sections: serverFiles,
-                    rootTemplatesPath: ['', '../../server/templates/', '../../java/generators/domain/templates/'],
+                    rootTemplatesPath: ['', '../../java/generators/domain/templates/'],
                     context: application,
                 });
             },
@@ -417,18 +392,20 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
             addJHipsterBomDependencies({ application, source }) {
                 const { applicationTypeGateway, applicationTypeMicroservice, javaDependencies, jhipsterDependenciesVersion, messageBrokerAny } = application;
                 const { serviceDiscoveryAny } = application;
-                if (application.buildToolMaven) {
-                    source.addMavenProperty?.({
-                        property: 'spring-boot.version',
-                        // eslint-disable-next-line no-template-curly-in-string
-                        value: '${project.parent.version}',
-                    });
-                }
-                source.addJavaDependencies?.([
-                    { groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: jhipsterDependenciesVersion },
-                ]);
-                if (applicationTypeGateway || applicationTypeMicroservice || serviceDiscoveryAny || messageBrokerAny) {
-                    source.addJavaDependencies?.([
+                source.addJavaDefinitions?.({
+                    dependencies: [{ groupId: 'tech.jhipster', artifactId: 'jhipster-framework', version: jhipsterDependenciesVersion }],
+                    mavenDefinition: {
+                        properties: [
+                            {
+                                property: 'spring-boot.version',
+                                // eslint-disable-next-line no-template-curly-in-string
+                                value: '${project.parent.version}',
+                            },
+                        ],
+                    },
+                }, {
+                    condition: applicationTypeGateway || applicationTypeMicroservice || serviceDiscoveryAny || messageBrokerAny,
+                    dependencies: [
                         {
                             groupId: 'org.springframework.cloud',
                             artifactId: 'spring-cloud-dependencies',
@@ -436,8 +413,8 @@ public void set${javaBeanCase(propertyName)}(${propertyType} ${propertyName}) {
                             scope: 'import',
                             version: javaDependencies['spring-cloud-dependencies'],
                         },
-                    ]);
-                }
+                    ],
+                });
             },
             addSpringdoc({ application, source }) {
                 const springdocDependency = `springdoc-openapi-starter-${application.reactive ? 'webflux' : 'webmvc'}-api`;

package/dist/generators/spring-boot/prompts.js

@@ -18,7 +18,7 @@
  */
 import chalk from 'chalk';
 import { includes, intersection } from 'lodash-es';
-import { applicationOptions, applicationTypes, authenticationTypes, databaseTypes, cacheTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.js';
+import { applicationOptions, applicationTypes, authenticationTypes, cacheTypes, databaseTypes, testFrameworkTypes, } from '../../jdl/jhipster/index.js';
 import { MESSAGE_BROKER } from '../server/options/index.js';
 import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from '../server/support/database.js';
 const { OptionNames } = applicationOptions;