generator-jhipster 8.0.0-beta.2 → 8.0.0-rc.1

package/dist/generators/liquibase/support/maven-plugin.mjs

@@ -1,4 +1,4 @@
-export default function mavenPluginContent({ reactive, packageName, srcMainResources, authenticationTypeOauth2, devDatabaseTypeH2Any, driver, url, username, password, hibernateDialect, defaultSchemaName = '', }) {
+export default function mavenPluginContent({ backendTypeSpringBoot, reactive, packageName, srcMainResources, authenticationTypeOauth2, devDatabaseTypeH2Any, driver, url, username, password, hibernateDialect, defaultSchemaName = '', }) {
     // prettier-ignore
     return `
     <configuration>
@@ -8,7 +8,7 @@ export default function mavenPluginContent({ reactive, packageName, srcMainResou
       <url>${url}</url>
       <defaultSchemaName>${defaultSchemaName}</defaultSchemaName>
       <username>${username}</username>
-      <password>${password}</password>${reactive ? '' : `
+      <password>${password}</password>${reactive || !backendTypeSpringBoot ? '' : `
       <referenceUrl>hibernate:spring:${packageName}.domain?dialect=${hibernateDialect}&amp;hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&amp;hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy</referenceUrl>`}
       <verbose>true</verbose>
       <logging>debug</logging>
@@ -25,7 +25,7 @@ export default function mavenPluginContent({ reactive, packageName, srcMainResou
         <groupId>org.liquibase.ext</groupId>
         <artifactId>liquibase-hibernate6</artifactId>
         <version>\${liquibase.version}</version>
-      </dependency>
+      </dependency>${backendTypeSpringBoot ? `
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -35,7 +35,7 @@ export default function mavenPluginContent({ reactive, packageName, srcMainResou
         <groupId>jakarta.validation</groupId>
         <artifactId>jakarta.validation-api</artifactId>
         <version>\${validation-api.version}</version>
-      </dependency>${devDatabaseTypeH2Any ? `
+      </dependency>` : ''}${devDatabaseTypeH2Any ? `
       <dependency>
         <groupId>com.h2database</groupId>
         <artifactId>h2</artifactId>

package/dist/generators/liquibase/support/post-prepare-entity.mjs

@@ -18,7 +18,7 @@
  */
 import { fieldTypes } from '../../../jdl/jhipster/index.mjs';
 const { CommonDBTypes } = fieldTypes;
-const { LONG: TYPE_LONG } = CommonDBTypes;
+const { LONG: TYPE_LONG, INTEGER: TYPE_INTEGER } = CommonDBTypes;
 export default function postPrepareEntity({ application, entity, }) {
     const { relationships, builtIn, name, primaryKey } = entity;
     if (builtIn && name === 'User') {
@@ -27,8 +27,8 @@ export default function postPrepareEntity({ application, entity, }) {
         const idFieldName = idField.fieldName ?? 'id';
         const liquibaseFakeData = application.generateUserManagement
             ? [
-                { [idFieldName]: userIdType === TYPE_LONG ? 1 : idField.generateFakeData() },
-                { [idFieldName]: userIdType === TYPE_LONG ? 2 : idField.generateFakeData() },
+                { [idFieldName]: [TYPE_INTEGER, TYPE_LONG].includes(userIdType) ? 1 : idField.generateFakeData() },
+                { [idFieldName]: [TYPE_INTEGER, TYPE_LONG].includes(userIdType) ? 2 : idField.generateFakeData() },
             ]
             : [];
         entity.liquibaseFakeData = liquibaseFakeData;

package/dist/generators/liquibase/support/prepare-field.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { databaseTypes, fieldTypes } from '../../../jdl/jhipster/index.mjs';
 const { MYSQL, MARIADB } = databaseTypes;
 const { CommonDBTypes, RelationalOnlyDBTypes, BlobTypes } = fieldTypes;

package/dist/generators/liquibase/support/relationship.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import { getFKConstraintName } from '../../server/support/index.mjs';
 function relationshipBaseDataEquals(relationshipA, relationshipB) {
     return (

package/dist/generators/liquibase/templates/gradle/liquibase.gradle.ejs

@@ -18,7 +18,7 @@ dependencies {
   <%_ if (prodDatabaseTypeMysql) { _%>
   liquibaseRuntime "com.mysql:mysql-connector-j"
   <%_ } _%>
-  <%_ if (prodDatabaseTypePostgres) { _%>
+  <%_ if (prodDatabaseTypePostgresql) { _%>
   liquibaseRuntime "org.postgresql:postgresql"
   <%_ } _%>
   <%_ if (prodDatabaseTypeMariadb) { _%>
@@ -69,7 +69,7 @@ liquibase {
       password "<%- devDatabasePassword %>"
 <%_ } _%>
       changelogFile project.ext.diffChangelogFile
-<%_ if (!reactive) { _%>
+<%_ if (!reactive && backendTypeSpringBoot) { _%>
       referenceUrl "hibernate:spring:<%= packageName %>.domain?dialect=<%= devHibernateDialect %>&hibernate.physical_naming_strategy=org.hibernate.boot.model.naming.CamelCaseToUnderscoresNamingStrategy&hibernate.implicit_naming_strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy"
 <%_ } _%>
 <%_ if (liquibaseDefaultSchemaName) { _%>
@@ -98,9 +98,11 @@ configurations {
     }
   }
 }
+<%_ if (backendTypeSpringBoot) { _%>
 
 ext {
   if (project.hasProperty("no-liquibase")) {
     springProfiles += ",no-liquibase"
   }
 }
+<%_ } _%>

package/dist/generators/liquibase/templates/src/main/java/_package_/config/LiquibaseConfiguration.java.ejs

@@ -0,0 +1,127 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+package <%= packageName %>.config;
+
+import tech.jhipster.config.JHipsterConstants;
+<%_ if (databaseTypeNeo4j || reactive) { _%>
+import java.util.Optional;
+import tech.jhipster.config.liquibase.AsyncSpringLiquibase;
+<%_ } else { _%>
+import tech.jhipster.config.liquibase.SpringLiquibaseUtil;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseDataSource;
+import org.springframework.beans.factory.ObjectProvider;
+<%_ } _%>
+<%_ if (databaseTypeSql && reactive) { _%>
+import org.springframework.boot.autoconfigure.r2dbc.R2dbcProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
+import liquibase.ext.neo4j.database.jdbc.Neo4jDriver;
+import org.springframework.boot.autoconfigure.neo4j.Neo4jProperties;
+import org.springframework.jdbc.datasource.SimpleDriverDataSource;
+<%_ } _%>
+
+import javax.sql.DataSource;
+import java.util.concurrent.Executor;
+
+import liquibase.integration.spring.SpringLiquibase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.liquibase.LiquibaseProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
+
+@Configuration
+public class LiquibaseConfiguration {
+
+    private final Logger log = LoggerFactory.getLogger(LiquibaseConfiguration.class);
+
+    private final Environment env;
+
+    public LiquibaseConfiguration(Environment env) {
+        this.env = env;
+    }
+
+    @Bean
+    public SpringLiquibase liquibase(
+        @Qualifier("taskExecutor") Executor executor,
+        LiquibaseProperties liquibaseProperties,
+<%_ if (databaseTypeNeo4j) { _%>
+        Neo4jProperties dataSourceProperties
+<%_ } else if (reactive) { _%>
+        R2dbcProperties dataSourceProperties
+<%_ } else { _%>
+        @LiquibaseDataSource ObjectProvider<DataSource> liquibaseDataSource,
+        ObjectProvider<DataSource> dataSource,
+        DataSourceProperties dataSourceProperties
+<%_ } _%>
+    ) {
+
+<%_ if (databaseTypeNeo4j || reactive) { _%>
+        SpringLiquibase liquibase = new AsyncSpringLiquibase(executor, env);
+        liquibase.setDataSource(createLiquibaseDataSource(liquibaseProperties, dataSourceProperties));
+<%_ } else { _%>
+        // If you don't want Liquibase to start asynchronously, substitute by this:
+        // SpringLiquibase liquibase = SpringLiquibaseUtil.createSpringLiquibase(liquibaseDataSource.getIfAvailable(), liquibaseProperties, dataSource.getIfUnique(), dataSourceProperties);
+        SpringLiquibase liquibase = SpringLiquibaseUtil.createAsyncSpringLiquibase(this.env, executor, liquibaseDataSource.getIfAvailable(), liquibaseProperties, dataSource.getIfUnique(), dataSourceProperties);
+<%_ } _%>
+        liquibase.setChangeLog("classpath:config/liquibase/master.xml");
+        liquibase.setContexts(liquibaseProperties.getContexts());
+        liquibase.setDefaultSchema(liquibaseProperties.getDefaultSchema());
+        liquibase.setLiquibaseSchema(liquibaseProperties.getLiquibaseSchema());
+        liquibase.setLiquibaseTablespace(liquibaseProperties.getLiquibaseTablespace());
+        liquibase.setDatabaseChangeLogLockTable(liquibaseProperties.getDatabaseChangeLogLockTable());
+        liquibase.setDatabaseChangeLogTable(liquibaseProperties.getDatabaseChangeLogTable());
+        liquibase.setDropFirst(liquibaseProperties.isDropFirst());
+        liquibase.setLabelFilter(liquibaseProperties.getLabelFilter());
+        liquibase.setChangeLogParameters(liquibaseProperties.getParameters());
+        liquibase.setRollbackFile(liquibaseProperties.getRollbackFile());
+        liquibase.setTestRollbackOnUpdate(liquibaseProperties.isTestRollbackOnUpdate());
+        if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_NO_LIQUIBASE))) {
+            liquibase.setShouldRun(false);
+        } else {
+            liquibase.setShouldRun(liquibaseProperties.isEnabled());
+            log.debug("Configuring Liquibase");
+        }
+        return liquibase;
+    }
+<%_ if (databaseTypeNeo4j) { _%>
+
+    public DataSource createLiquibaseDataSource(LiquibaseProperties liquibaseProperties, Neo4jProperties dataSourceProperties) {
+        String url = Optional.ofNullable(liquibaseProperties.getUrl()).orElse("jdbc:neo4j:" + dataSourceProperties.getUri().toString());
+        String user = Optional.ofNullable(liquibaseProperties.getUser()).orElse(dataSourceProperties.getAuthentication().getUsername());
+        String password = Optional.ofNullable(liquibaseProperties.getPassword()).orElse(dataSourceProperties.getAuthentication().getPassword());
+
+        return new SimpleDriverDataSource(new Neo4jDriver(), url, user, password);
+    }
+<%_ } _%>
+<%_ if (databaseTypeSql && reactive) { _%>
+
+    private static DataSource createLiquibaseDataSource(LiquibaseProperties liquibaseProperties, R2dbcProperties dataSourceProperties) {
+        String user = Optional.ofNullable(liquibaseProperties.getUser()).orElse(dataSourceProperties.getUsername());
+        String password = Optional.ofNullable(liquibaseProperties.getPassword()).orElse(dataSourceProperties.getPassword());
+
+        return DataSourceBuilder.create().url(liquibaseProperties.getUrl()).username(user).password(password).build();
+    }
+<%_ } _%>
+}

package/dist/generators/{liquibase-changelogs → liquibase}/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs

@@ -24,13 +24,19 @@
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd
                         http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
 
+<%_ fields.filter(field => field.liquibaseCustomSequenceGenerator).forEach((field, idx) => { _%>
+    <changeSet id="<%= changelogDate %>-seq-<%- idx %>" author="jhipster">
+        <createSequence sequenceName="<%- field.liquibaseSequenceGeneratorName %>" startValue="1050" incrementBy="50"/>
+    </changeSet>
+
+<%_ }); _%>
     <!--
         Added the entity <%= entity.entityClass %>.
     -->
     <changeSet id="<%= changelogDate %>-1" author="jhipster">
-        <createTable tableName="<%= entity.entityTableName %>"<%- this.formatAsLiquibaseRemarks(entity.javadoc, true) %>>
+        <createTable tableName="<%= entity.entityTableName %>"<%- this.formatAsLiquibaseRemarks(entity.documentation, true) %>>
 <%_ for (field of fields) { _%>
-            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.javadoc, true) %><% if (field.id && field.liquibaseAutoIncrement) { %> autoIncrement="true" <%_ } %>>
+            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.documentation, true) %><% if (field.id && field.liquibaseAutoIncrement) { %> autoIncrement="true" startWith="1500"<%_ } %>>
     <%_ if (field.id) { _%>
                 <constraints primaryKey="true" nullable="false"/>
     <%_ } else if (field.unique) { _%>

package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/initial_schema_sql.xml.ejs

@@ -29,8 +29,21 @@
     <changeSet id="00000000000000" author="jhipster">
         <createSequence sequenceName="sequence_generator" startValue="1050" incrementBy="50"/>
     </changeSet>
+
 <%_ } _%>
+<%_
+  if (generateBuiltInUserEntity) {
+    const idField = user.primaryKey.fields[0];
+    if (idField.liquibaseCustomSequenceGenerator) {
+_%>
+    <changeSet id="00000000000000-seq-user" author="jhipster">
+        <createSequence sequenceName="<%- idField.liquibaseSequenceGeneratorName %>" startValue="1050" incrementBy="50"/>
+    </changeSet>
 
+<%_
+    }
+  }
+_%>
     <!--
         JHipster core tables.
         The initial schema has the '00000000000001' id, so that it is over-written if we re-generate it.
@@ -40,7 +53,7 @@
         const idField = user.primaryKey.fields[0];
 _%>
         <createTable tableName="<%= user.entityTableName %>">
-            <column name="id" type="<%= idField.columnType %>"<% if (idField.liquibaseAutoIncrement) { %> autoIncrement="true"<% } %><% if (reactive && idField.fieldType === 'Long') { %> startWith="1050"<% } %>>
+            <column name="id" type="<%= idField.columnType %>"<% if (idField.liquibaseAutoIncrement) { %> autoIncrement="true" startWith="1050"<% } %>>
                 <constraints primaryKey="true" nullable="false"/>
             </column>
             <column name="login" type="varchar(50)">
@@ -148,7 +161,7 @@ _%>
                   separator=";"
                   tableName="<%= user.entityTableName %>"
                   usePreparedStatements="true">
-    <%_ if (prodDatabaseTypePostgres) { _%>
+    <%_ if (prodDatabaseTypePostgresql) { _%>
             <column name="id" type="<%= idField.loadColumnType %>"/>
     <%_ } _%>
             <column name="activated" type="boolean"/>

package/dist/generators/{liquibase-changelogs → liquibase}/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs

@@ -31,7 +31,7 @@
     <changeSet id="<%= changelogDate %>-1-add-columns" author="jhipster">
         <addColumn tableName="<%= entity.entityTableName %>">
     <%_ for (field of addedFields) { _%>
-            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.javadoc, true) %>/>
+            <column name="<%= field.columnName %>" type="<%= field.columnType %>"<%- this.formatAsLiquibaseRemarks(field.documentation, true) %>/>
         <%_ if (field.shouldCreateContentType) { _%>
             <column name="<%= field.columnName %>_content_type" type="varchar(255)"/>
         <%_ }

package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/master.xml.ejs

@@ -3,7 +3,7 @@
     xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
-<%_ if (devDatabaseTypeH2Any) { _%>
+<%_ if (liquibaseAddH2Properties) { _%>
     <property name="now" value="now()" dbms="h2"/>
     <property name="floatType" value="float4" dbms="h2"/>
   <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb) { _%>
@@ -11,15 +11,15 @@
   <%_ } else { _%>
     <property name="uuidType" value="uuid" dbms="h2"/>
   <%_ } _%>
-    <property name="datetimeType" value="datetime" dbms="h2"/>
-  <%_ if (prodDatabaseTypePostgres) { _%>
+    <property name="datetimeType" value="datetime(6)" dbms="h2"/>
+  <%_ if (prodDatabaseTypePostgresql) { _%>
     <property name="clobType" value="longvarchar" dbms="h2"/>
   <%_ } else { _%>
     <property name="clobType" value="clob" dbms="h2"/>
   <%_ } _%>
     <property name="blobType" value="blob" dbms="h2"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeMysql || prodDatabaseTypeMysql) { _%>
+<%_ if (prodDatabaseTypeMysql) { _%>
     <property name="now" value="now()" dbms="mysql"/>
     <property name="floatType" value="float" dbms="mysql"/>
     <property name="clobType" value="clob" dbms="mysql"/>
@@ -27,7 +27,7 @@
     <property name="uuidType" value="varchar(36)" dbms="mysql"/>
     <property name="datetimeType" value="datetime(6)" dbms="mysql"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeMariadb || prodDatabaseTypeMariadb) { _%>
+<%_ if (prodDatabaseTypeMariadb) { _%>
     <property name="now" value="now()" dbms="mariadb"/>
     <property name="floatType" value="float" dbms="mariadb"/>
     <property name="clobType" value="clob" dbms="mariadb"/>
@@ -35,7 +35,7 @@
     <property name="uuidType" value="varchar(36)" dbms="mariadb"/>
     <property name="datetimeType" value="datetime(6)" dbms="mariadb"/>
 <%_ } _%>
-<%_ if (devDatabaseTypePostgres || prodDatabaseTypePostgres) { _%>
+<%_ if (prodDatabaseTypePostgresql) { _%>
     <property name="now" value="current_timestamp" dbms="postgresql"/>
     <property name="floatType" value="float4" dbms="postgresql"/>
     <property name="clobType" value="clob" dbms="postgresql"/>
@@ -51,7 +51,7 @@
     <property name="uuidType" value="uuid" dbms="postgresql"/>
     <property name="datetimeType" value="datetime" dbms="postgresql"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeOracle || prodDatabaseTypeOracle) { _%>
+<%_ if (prodDatabaseTypeOracle) { _%>
     <property name="now" value="sysdate" dbms="oracle"/>
     <property name="floatType" value="float" dbms="oracle"/>
     <property name="clobType" value="clob" dbms="oracle"/>
@@ -59,7 +59,7 @@
     <property name="uuidType" value="uuid" dbms="oracle"/>
     <property name="datetimeType" value="datetime" dbms="oracle"/>
 <%_ } _%>
-<%_ if (devDatabaseTypeMssql || prodDatabaseTypeMssql) { _%>
+<%_ if (prodDatabaseTypeMssql) { _%>
     <property name="now" value="GETDATE()" dbms="mssql"/>
     <property name="floatType" value="float" dbms="mssql"/>
     <property name="clobType" value="clob" dbms="mssql"/>

package/dist/generators/maven/files.mjs

@@ -19,13 +19,11 @@
 export default {
     maven: [
         {
-            templates: [
-                { file: 'mvnw', noEjs: true },
-                { file: 'mvnw.cmd', noEjs: true },
-                { file: '.mvn/wrapper/maven-wrapper.jar', noEjs: true },
-                { file: '.mvn/wrapper/maven-wrapper.properties', noEjs: true },
-                { file: '.mvn/jvm.config', noEjs: true },
-            ],
+            templates: ['.prettierignore.jhi.maven'],
+        },
+        {
+            transform: false,
+            templates: ['mvnw', 'mvnw.cmd', '.mvn/wrapper/maven-wrapper.jar', '.mvn/wrapper/maven-wrapper.properties', '.mvn/jvm.config'],
         },
     ],
 };

package/dist/generators/maven/generator.mjs

@@ -26,20 +26,37 @@ import cleanupOldServerFilesTask from './cleanup.mjs';
 import { createPomStorage } from './support/index.mjs';
 export default class MavenGenerator extends BaseApplicationGenerator {
     pomStorage;
-    constructor(args, options, features) {
-        super(args, options, features);
-        if (this.options.help)
-            return;
-        this.config.defaults({
-            buildTool: MAVEN,
-        });
-    }
     async beforeQueue() {
-        this.pomStorage = createPomStorage(this);
         if (!this.fromBlueprint) {
-            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
             await this.composeWithBlueprints(GENERATOR_MAVEN);
         }
+        if (!this.delegateToBlueprint) {
+            await this.dependsOnJHipster(GENERATOR_BOOTSTRAP_APPLICATION_SERVER);
+        }
+    }
+    get initializing() {
+        return this.asInitializingTaskGroup({
+            pomStorage() {
+                this.pomStorage = createPomStorage(this);
+            },
+        });
+    }
+    get [BaseApplicationGenerator.INITIALIZING]() {
+        return this.delegateTasksToBlueprint(() => this.initializing);
+    }
+    get configuring() {
+        return this.asConfiguringTaskGroup({
+            configure() {
+                if (this.jhipsterConfigWithDefaults.buildTool !== MAVEN) {
+                    this.config.defaults({
+                        buildTool: MAVEN,
+                    });
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.CONFIGURING]() {
+        return this.delegateTasksToBlueprint(() => this.configuring);
     }
     get preparing() {
         return this.asPreparingTaskGroup({

package/dist/generators/maven/internal/xml-store.mjs

@@ -18,7 +18,7 @@
  */
 import assert from 'assert';
 import { XMLParser, XMLBuilder } from 'fast-xml-parser';
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 const { merge } = _;
 const defaultXmlCommonOptions = {
     ignoreAttributes: false,
@@ -37,6 +37,7 @@ const defaultXmlBuildOptions = {
     indentBy: '    ',
 };
 export default class XmlStorage {
+    sortFile = true;
     saveFile;
     loadFile;
     parser;
@@ -53,12 +54,14 @@ export default class XmlStorage {
     clearCache() {
         delete this._cachedStore;
     }
-    save() {
-        this.sort();
+    save(sort = this.sortFile) {
+        if (sort) {
+            this.sort();
+        }
         this.persist(false);
     }
     sort() { }
-    persist(sort = true) {
+    persist(sort = this.sortFile) {
         if (this._cachedStore) {
             if (sort) {
                 this.sort();

package/dist/generators/maven/support/pom-store.mjs

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import _ from 'lodash';
+import * as _ from 'lodash-es';
 import sortKeys from 'sort-keys';
 import XmlStorage from '../internal/xml-store.mjs';
 const { set, get } = _;
@@ -28,6 +28,7 @@ const rootOrder = [
     'packaging',
     'name',
     'description',
+    'parent',
     'repositories',
     'pluginRepositories',
     'distributionManagement',
@@ -116,9 +117,17 @@ const ensureProfile = (project, profileId) => {
 };
 const groupIdOrder = ['tech.jhipster', 'org.springframework.boot', 'org.springframework.security', 'org.springdoc'];
 const sortArtifacts = (artifacts) => artifacts.sort((a, b) => {
-    const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId);
-    if (groupIdCompared)
-        return groupIdCompared;
+    if (a.groupId !== b.groupId) {
+        if (a.groupId === undefined) {
+            return -1;
+        }
+        if (b.groupId === undefined) {
+            return 1;
+        }
+        const groupIdCompared = sortWithTemplate(groupIdOrder, a.groupId, b.groupId);
+        if (groupIdCompared)
+            return groupIdCompared;
+    }
     return a.artifactId.localeCompare(b.artifactId);
 });
 const sortProfiles = (profiles) => profiles.sort((a, b) => a.id.localeCompare(b.id));

package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

package/dist/generators/maven/templates/.prettierignore.jhi.maven.ejs

@@ -0,0 +1,23 @@
+<%#
+ Copyright 2013-2023 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+<&_ if (!fragment.section) { -&>
+# Generated by jhipster:maven
+target
+.mvn
+<&_ } -&>

package/dist/generators/needle-api.mjs

@@ -21,8 +21,6 @@ import Client from './client/needle-api/needle-client.mjs';
 import ClientAngular from './angular/needle-api/needle-client-angular.mjs';
 import ClientReact from './react/needle-api/needle-client-react.mjs';
 import ClientVue from './client/needle-api/needle-client-vue.mjs';
-import ClientWebpack from './client/needle-api/needle-client-webpack.mjs';
-import ClientI18n from './client/needle-api/needle-client-i18n.mjs';
 export default class NeedleApi {
     constructor(generator) {
         this.base = new Base(generator);
@@ -30,7 +28,5 @@ export default class NeedleApi {
         this.clientAngular = new ClientAngular(generator);
         this.clientReact = new ClientReact(generator);
         this.clientVue = new ClientVue(generator);
-        this.clientWebpack = new ClientWebpack(generator);
-        this.clientI18n = new ClientI18n(generator);
     }
 }

package/dist/generators/openapi-client/files.mjs

@@ -23,6 +23,7 @@ import { SERVER_MAIN_SRC_DIR, OPENAPI_GENERATOR_CLI_VERSION } from '../generator
 import { applicationOptions, buildToolTypes, applicationTypes, authenticationTypes } from '../../jdl/jhipster/index.mjs';
 import { addGradleDependencyCallback, addGradlePropertyCallback } from '../gradle/internal/needles.mjs';
 import { getPomVersionProperties } from '../server/support/dependabot-maven.mjs';
+import { getMainClassName } from '../java/support/index.mjs';
 const { OptionNames } = applicationOptions;
 const { GRADLE, MAVEN } = buildToolTypes;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
@@ -156,7 +157,7 @@ export function customizeFiles() {
                 return;
             }
             this.javaDir = `${SERVER_MAIN_SRC_DIR + this.packageFolder}/`;
-            const mainClassFile = `${this.javaDir + this.getMainClassName()}.java`;
+            const mainClassFile = `${this.javaDir + getMainClassName({ baseName: this.jhipsterConfig.baseName })}.java`;
             if (this.applicationType !== MICROSERVICE || ![JWT].includes(this.authenticationType)) {
                 this.rewriteFile(mainClassFile, 'import org.springframework.core.env.Environment;', 'import org.springframework.cloud.openfeign.EnableFeignClients;');
                 this.rewriteFile(mainClassFile, '@SpringBootApplication', '@EnableFeignClients');
@@ -167,7 +168,7 @@ export function customizeFiles() {
                 return;
             }
             this.javaDir = `${SERVER_MAIN_SRC_DIR + this.packageFolder}/`;
-            const mainClassFile = `${this.javaDir + this.getMainClassName()}.java`;
+            const mainClassFile = `${this.javaDir + getMainClassName({ baseName: this.jhipsterConfig.baseName })}.java`;
             this.rewriteFile(mainClassFile, 'import org.springframework.core.env.Environment;', 'import org.springframework.context.annotation.ComponentScan;\nimport org.springframework.context.annotation.FilterType;');
             const componentScan = '@ComponentScan( excludeFilters = {\n' +
                 '   @ComponentScan.Filter(type = FilterType.REGEX, ' +