generator-jhipster 8.5.0 → 8.7.0

package/dist/generators/languages/support/load-config.js

@@ -1,4 +1,4 @@
-import { findLanguageForTag, supportedLanguages as baseSupportedLanguages } from './languages.js';
+import { supportedLanguages as baseSupportedLanguages, findLanguageForTag } from './languages.js';
 /**
  * Load translation config into application
  */

package/dist/generators/languages/templates/entity/i18n/entity_ar-ly.json.ejs

@@ -22,24 +22,24 @@ let helpBlocks = 0; %>
         "<%= entityTranslationKey %>" : {
             "home": {
                 "title": "<%= entityClassPluralHumanized %>",
-                "refreshListLabel": "Refresh list",
+                "refreshListLabel": "تحديث القائمة",
 <%_ if (!readOnly) { _%>
-                "createLabel": "Create a new <%= entityClassHumanized %>",
-                "createOrEditLabel": "Create or edit a <%= entityClassHumanized %>",
+                "createLabel": "إنشاء <%= entityClassHumanized %> جديد",
+                "createOrEditLabel": "إنشاء أو تعديل <%= entityClassHumanized %>",
 <%_ } _%>
 <%_ if (searchEngineAny) { _%>
-                "search": "Search for <%= entityClassHumanized %>",
+                "search": "البحث عن <%= entityClassHumanized %>",
 <%_ } _%>
-                "notFound": "No <%= entityClassPluralHumanized %> found"
+                "notFound": "لم يتم العثور على <%= entityClassPluralHumanized %>"
             },
 <%_ if (!microserviceAppName && !readOnly) { _%>
-            "created": "A new <%= entityClassHumanized %> is created with identifier {{ param }}",
-            "updated": "A <%= entityClassHumanized %> is updated with identifier {{ param }}",
-            "deleted": "A <%= entityClassHumanized %> is deleted with identifier {{ param }}",
+            "created": "<%= entityClassHumanized %> جديد تم إنشاؤه بالمعرف {{ param }}",
+            "updated": "<%= entityClassHumanized %> تم تحديثه بالمعرف {{ param }}",
+            "deleted": "<%= entityClassHumanized %> تم حذفه بالمعرف {{ param }}",
 <%_ } _%>
 <%_ if (!readOnly) { _%>
             "delete": {
-                "question": "Are you sure you want to delete <%= entityClassHumanized %> {{ id }}?"
+                "question": "هل أنت متأكد أنك تريد حذف <%= entityClassHumanized %> {{ id }}؟"
             },
 <%_ } _%>
             "detail": {
@@ -60,9 +60,9 @@ let helpBlocks = 0; %>
 <%_ if (microserviceAppName && !readOnly) { _%>,
     "<%= microserviceAppName %>": {
         "<%= entityTranslationKey %>" : {
-            "created": "A new <%= entityClassHumanized %> is created with identifier {{ param }}",
-            "updated": "A <%= entityClassHumanized %> is updated with identifier {{ param }}",
-            "deleted": "A <%= entityClassHumanized %> is deleted with identifier {{ param }}"
+            "created": "<%= entityClassHumanized %> جديد تم إنشاؤه بالمعرف {{ param }}",
+            "updated": "<%= entityClassHumanized %> تم تحديثه بالمعرف {{ param }}",
+            "deleted": "<%= entityClassHumanized %> تم حذفه بالمعرف {{ param }}"
         }
     }
 <%_ } _%>

package/dist/generators/liquibase/files.js

@@ -1,6 +1,5 @@
 import { SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR } from '../generator-constants.js';
 import { moveToJavaPackageSrcDir } from '../server/support/index.js';
-// eslint-disable-next-line import/prefer-default-export
 export const liquibaseFiles = {
     liquibase: [
         {

package/dist/generators/liquibase/generator.js

@@ -19,15 +19,15 @@
 import fs from 'fs';
 import { escape, min } from 'lodash-es';
 import BaseEntityChangesGenerator from '../base-entity-changes/index.js';
-import { liquibaseFiles } from './files.js';
-import { prepareField as prepareFieldForLiquibase, postPrepareEntity, prepareRelationshipForLiquibase, liquibaseComment, } from './support/index.js';
 import { getFKConstraintName, getUXConstraintName, prepareEntity as prepareEntityForServer } from '../server/support/index.js';
-import { prepareEntityPrimaryKeyForTemplates, prepareRelationship, prepareField, prepareEntity, loadRequiredConfigIntoEntity, } from '../base-application/support/index.js';
-import mavenPlugin from './support/maven-plugin.js';
-import { addLiquibaseChangelogCallback, addLiquibaseConstraintsChangelogCallback, addLiquibaseIncrementalChangelogCallback, } from './internal/needles.js';
+import { loadRequiredConfigIntoEntity, prepareEntity, prepareEntityPrimaryKeyForTemplates, prepareField, prepareRelationship, } from '../base-application/support/index.js';
 import { prepareSqlApplicationProperties } from '../spring-data-relational/support/index.js';
-import { addEntityFiles, updateEntityFiles, updateConstraintsFiles, updateMigrateFiles, fakeFiles } from './changelog-files.js';
 import { fieldTypes } from '../../jdl/jhipster/index.js';
+import { liquibaseFiles } from './files.js';
+import { liquibaseComment, postPrepareEntity, prepareField as prepareFieldForLiquibase, prepareRelationshipForLiquibase, } from './support/index.js';
+import mavenPlugin from './support/maven-plugin.js';
+import { addLiquibaseChangelogCallback, addLiquibaseConstraintsChangelogCallback, addLiquibaseIncrementalChangelogCallback, } from './internal/needles.js';
+import { addEntityFiles, fakeFiles, updateConstraintsFiles, updateEntityFiles, updateMigrateFiles } from './changelog-files.js';
 const { CommonDBTypes: { LONG: TYPE_LONG, INTEGER: TYPE_INTEGER }, } = fieldTypes;
 export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
     recreateInitialChangelog;
@@ -53,16 +53,6 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
             await this.dependsOnBootstrapApplicationServer();
         }
     }
-    get initializing() {
-        return this.asInitializingTaskGroup({
-            async parseCommand() {
-                await this.parseCurrentJHipsterCommand();
-            },
-        });
-    }
-    get [BaseEntityChangesGenerator.INITIALIZING]() {
-        return this.delegateTasksToBlueprint(() => this.initializing);
-    }
     get preparing() {
         return this.asPreparingTaskGroup({
             preparing({ application }) {
@@ -431,6 +421,9 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
                 }
                 source.addGradleProperty?.({ property: 'liquibaseTaskPrefix', value: 'liquibase' });
                 source.addGradleProperty?.({ property: 'liquibasePluginVersion', value: gradleLiquibaseVersion });
+                if (application.javaManagedProperties && application.javaManagedProperties['liquibase.version']) {
+                    source.addGradleProperty?.({ property: 'liquibaseCoreVersion', value: application.javaManagedProperties['liquibase.version'] });
+                }
                 source.applyFromGradle?.({ script: 'gradle/liquibase.gradle' });
                 source.addGradlePlugin?.({ id: 'org.liquibase.gradle' });
                 // eslint-disable-next-line no-template-curly-in-string
@@ -591,7 +584,6 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator {
         if (entity.skipServer) {
             return undefined;
         }
-        // eslint-disable-next-line no-nested-ternary
         const entityChanges = databaseChangelog.changelogData;
         entityChanges.skipFakeData = application.skipFakeData || entity.skipFakeData;
         entityChanges.allFields = entity.fields.filter(field => !field.transient);

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

@@ -50,12 +50,11 @@ 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 static final Logger LOG = LoggerFactory.getLogger(LiquibaseConfiguration.class);
 
     private final Environment env;
 
@@ -64,7 +63,7 @@ public class LiquibaseConfiguration {
     }
 <%_ if (databaseTypeSql && !reactive) { _%>
 
-    @Value( "${application.liquibase.async-start:true}" )
+    @Value("${application.liquibase.async-start:true}")
     private Boolean asyncStart;
 <%_ } _%>
 
@@ -106,11 +105,11 @@ public class LiquibaseConfiguration {
         liquibase.setChangeLogParameters(liquibaseProperties.getParameters());
         liquibase.setRollbackFile(liquibaseProperties.getRollbackFile());
         liquibase.setTestRollbackOnUpdate(liquibaseProperties.isTestRollbackOnUpdate());
-        if (env.acceptsProfiles(Profiles.of(JHipsterConstants.SPRING_PROFILE_NO_LIQUIBASE))) {
+        if (env.matchesProfiles(JHipsterConstants.SPRING_PROFILE_NO_LIQUIBASE)) {
             liquibase.setShouldRun(false);
         } else {
             liquibase.setShouldRun(liquibaseProperties.isEnabled());
-            log.debug("Configuring Liquibase");
+            LOG.debug("Configuring Liquibase");
         }
         return liquibase;
     }

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

@@ -134,7 +134,7 @@ if (hasFieldConstraint) { _%>
             const otherEntityConstraintName = this.getFKConstraintName(relationship.joinTable.name, relationship.columnName, prodDatabaseType);
     _%>
 
-        <addForeignKeyConstraint baseColumnNames="<%= entity.primaryKey.fields.map(field => relationship.columnName + '_' + field.columnName).join(', ') %>"
+        <addForeignKeyConstraint baseColumnNames="<%= entity.primaryKey.fields.map(field => entity.entityTableName + '_' + field.columnName).join(', ') %>"
                                  baseTableName="<%= relationship.joinTable.name %>"
                                  constraintName="<%= constraintName %>"
                                  referencedColumnNames="<%= entity.primaryKey.fields.map(field => field.columnName).join(', ') %>"

package/dist/generators/maven/command.js

@@ -0,0 +1,16 @@
+const command = {
+    options: {},
+    configs: {
+        sortMavenPom: {
+            description: 'Sort the pom.xml file',
+            cli: {
+                type: Boolean,
+                hide: true,
+                default: true,
+            },
+            scope: 'generator',
+        },
+    },
+    import: [],
+};
+export default command;

package/dist/generators/maven/generator.js

@@ -16,15 +16,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable consistent-return */
-import assert from 'assert/strict';
+import assert from 'node:assert/strict';
+import { passthrough } from '@yeoman/transform';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import BaseApplicationGenerator from '../base-application/index.js';
 import files from './files.js';
 import { MAVEN } from './constants.js';
 import cleanupOldServerFilesTask from './cleanup.js';
-import { createPomStorage } from './support/index.js';
+import { createPomStorage, sortPomFile } from './support/index.js';
 export default class MavenGenerator extends BaseApplicationGenerator {
     pomStorage;
+    sortMavenPom;
     async beforeQueue() {
         if (!this.fromBlueprint) {
             await this.composeWithBlueprints();
@@ -36,7 +38,7 @@ export default class MavenGenerator extends BaseApplicationGenerator {
     get initializing() {
         return this.asInitializingTaskGroup({
             pomStorage() {
-                this.pomStorage = createPomStorage(this);
+                this.pomStorage = createPomStorage(this, { sortFile: false });
             },
         });
     }
@@ -72,6 +74,7 @@ export default class MavenGenerator extends BaseApplicationGenerator {
                         }
                     };
                 }
+                source.mergeMavenPomContent = content => this.pomStorage.merge(content);
                 source.addMavenAnnotationProcessor = createForEach(artifact => this.pomStorage.addAnnotationProcessor(artifact));
                 source.addMavenDependency = createForEach(artifact => this.pomStorage.addDependency(artifact));
                 source.addMavenDependencyManagement = createForEach(artifact => this.pomStorage.addDependencyManagement(artifact));
@@ -110,6 +113,24 @@ export default class MavenGenerator extends BaseApplicationGenerator {
     get [BaseApplicationGenerator.PREPARING]() {
         return this.delegateTasksToBlueprint(() => this.preparing);
     }
+    get default() {
+        return this.asDefaultTaskGroup({
+            queueTranslateTransform() {
+                if (this.sortMavenPom) {
+                    this.queueTransformStream({
+                        name: 'sorting pom.xml file',
+                        filter: file => isFileStateModified(file) && file.path === this.destinationPath('pom.xml'),
+                        refresh: false,
+                    }, passthrough(file => {
+                        file.contents = Buffer.from(sortPomFile(file.contents.toString()));
+                    }));
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.DEFAULT]() {
+        return this.delegateTasksToBlueprint(() => this.default);
+    }
     get writing() {
         return this.asWritingTaskGroup({
             cleanupOldServerFilesTask,

package/dist/generators/maven/generators/code-quality/generator.js

@@ -27,38 +27,6 @@ export default class CodeQualityGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster('maven');
         }
     }
-    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();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
-    get loading() {
-        return this.asLoadingTaskGroup({
-            async loadConfig({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.LOADING]() {
-        return this.delegateTasksToBlueprint(() => this.loading);
-    }
     get postWriting() {
         return this.asPostWritingTaskGroup({
             checkstyle({ application, source }) {

package/dist/generators/maven/generators/frontend-plugin/generator.js

@@ -27,38 +27,6 @@ export default class FrontendPluginGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster('maven');
         }
     }
-    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();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
-    get loading() {
-        return this.asLoadingTaskGroup({
-            async loadConfig({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.LOADING]() {
-        return this.delegateTasksToBlueprint(() => this.loading);
-    }
     get postWriting() {
         return this.asPostWritingTaskGroup({
             customize({ application, source }) {

package/dist/generators/maven/generators/jib/generator.js

@@ -27,38 +27,6 @@ export default class JibGenerator extends BaseApplicationGenerator {
             await this.dependsOnJHipster('maven');
         }
     }
-    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();
-            },
-        });
-    }
-    get [BaseApplicationGenerator.PROMPTING]() {
-        return this.delegateTasksToBlueprint(() => this.prompting);
-    }
-    get loading() {
-        return this.asLoadingTaskGroup({
-            async loadConfig({ application }) {
-                await this.loadCurrentJHipsterCommandConfig(application);
-            },
-        });
-    }
-    get [BaseApplicationGenerator.LOADING]() {
-        return this.delegateTasksToBlueprint(() => this.loading);
-    }
     get postWriting() {
         return this.asPostWritingTaskGroup({
             addJibPlugin({ application, source }) {
@@ -122,8 +90,27 @@ export default class JibGenerator extends BaseApplicationGenerator {
                 <mode>755</mode>
             </permission>
         </permissions>
-    </extraDirectories>
-</configuration>`,
+    </extraDirectories>${application.backendTypeSpringBoot
+                                ? `
+    <pluginExtensions>
+        <pluginExtension>
+            <implementation>com.google.cloud.tools.jib.maven.extension.springboot.JibSpringBootExtension</implementation>
+        </pluginExtension>
+    </pluginExtensions>
+`
+                                : ''}
+</configuration>${application.backendTypeSpringBoot
+                                ? `
+<dependencies>
+    <dependency>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>jib-spring-boot-extension-maven</artifactId>
+        <version>${application.javaDependencies['jib-spring-boot-extension-maven']}</version>
+    </dependency>
+</dependencies>
+`
+                                : ''}
+`,
                         },
                     ],
                 });

package/dist/generators/maven/index.js

@@ -16,4 +16,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export { default as command } from './command.js';
 export { default } from './generator.js';

package/dist/generators/maven/internal/pom-sort.js

@@ -0,0 +1,144 @@
+/**
+ * Copyright 2013-2024 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.
+ */
+import sortKeys from 'sort-keys';
+export const formatPomFirstLevel = content => content.replace(/(\n {4}<(?:groupId|distributionManagement|repositories|pluginRepositories|properties|dependencyManagement|dependencies|build|profiles)>)/g, '\n$1');
+const rootAndProfileOrder = [
+    'id',
+    'activation',
+    'modelVersion',
+    'groupId',
+    'artifactId',
+    'version',
+    'packaging',
+    'name',
+    'description',
+    'parent',
+    'repositories',
+    'pluginRepositories',
+    'distributionManagement',
+    'properties',
+    'dependencyManagement',
+    'dependencies',
+    'build',
+    'profiles',
+];
+const propertiesOrder = [
+    'maven.version',
+    'java.version',
+    'node.version',
+    'npm.version',
+    'project.build.sourceEncoding',
+    'project.reporting.outputEncoding',
+    'maven.build.timestamp.format',
+    'maven.compiler.source',
+    'maven.compiler.target',
+    'start-class',
+    'argLine',
+    'm2e.apt.activation',
+    'run.addResources',
+    'jhipster-dependencies.version',
+    'spring-boot.version',
+];
+const groupIdOrder = [
+    'tech.jhipster',
+    'org.apache.maven.plugins',
+    'org.springframework.boot',
+    'org.springframework.security',
+    'org.springdoc',
+];
+const sortSection = section => {
+    return Object.fromEntries(Object.entries(section).sort(([key1, value1], [key2, value2]) => {
+        if (typeof value1 === typeof value2)
+            key1.localeCompare(key2);
+        if (typeof value1 === 'string')
+            return -1;
+        if (typeof value2 === 'string')
+            return 1;
+        return 0;
+    }));
+};
+const isComment = name => name.startsWith('#');
+const toMaxInt = nr => (nr === -1 ? Number.MAX_SAFE_INTEGER : nr);
+const sortWithTemplate = (template, a, b) => {
+    if (isComment(a))
+        return -1;
+    if (isComment(b))
+        return 1;
+    const indexOfA = toMaxInt(template.indexOf(a));
+    const indexOfB = toMaxInt(template.indexOf(b));
+    if (indexOfA === indexOfB) {
+        return a.localeCompare(b);
+    }
+    return indexOfA - indexOfB;
+};
+const comparator = (order) => (a, b) => sortWithTemplate(order, a, b);
+const sortProperties = properties => sortKeys(properties, { compare: comparator(propertiesOrder) });
+const sortArtifacts = (artifacts) => artifacts.sort((a, b) => {
+    if (a.scope === 'import' || b.scope === 'import') {
+        if (a.scope === b.scope) {
+            return 1;
+        }
+        return a.scope === 'import' ? -1 : 1;
+    }
+    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) ?? 1);
+const sortProjectLike = (projectLike) => {
+    projectLike = sortKeys(projectLike, { compare: comparator(rootAndProfileOrder) });
+    if (projectLike.properties) {
+        projectLike.properties = sortProperties(projectLike.properties);
+    }
+    if (Array.isArray(projectLike.dependencies?.dependency)) {
+        projectLike.dependencies.dependency = sortArtifacts(projectLike.dependencies.dependency);
+    }
+    if (Array.isArray(projectLike.dependencyManagement?.dependencies?.dependency)) {
+        projectLike.dependencyManagement.dependencies.dependency = sortArtifacts(projectLike.dependencyManagement.dependencies.dependency);
+    }
+    if (projectLike.build) {
+        projectLike.build = sortSection(projectLike.build);
+        if (Array.isArray(projectLike.build.plugins?.plugin)) {
+            projectLike.build.plugins.plugin = sortArtifacts(projectLike.build.plugins.plugin);
+        }
+        if (Array.isArray(projectLike.build.pluginManagement?.plugins?.plugin)) {
+            projectLike.build.pluginManagement.plugins.plugin = sortArtifacts(projectLike.build.pluginManagement.plugins.plugin);
+        }
+    }
+    return projectLike;
+};
+export const sortPomProject = (project) => {
+    project = sortProjectLike(project);
+    if (Array.isArray(project.profiles?.profile)) {
+        project.profiles.profile = sortProfiles(project.profiles.profile.map(profile => sortProjectLike(profile)));
+    }
+    else if (project.profiles?.profile) {
+        project.profiles.profile = sortProjectLike(project.profiles.profile);
+    }
+    return project;
+};

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

@@ -17,18 +17,19 @@
  * limitations under the License.
  */
 import assert from 'assert';
-import { XMLParser, XMLBuilder } from 'fast-xml-parser';
+import { XMLBuilder, XMLParser } from 'fast-xml-parser';
 import { merge } from 'lodash-es';
 const defaultXmlCommonOptions = {
     ignoreAttributes: false,
     attributeNamePrefix: '@@',
     commentPropName: '#comment',
-    parseAttributeValue: false,
 };
-const defaultXmlParserOptions = {
+export const defaultXmlParserOptions = {
+    parseAttributeValue: false,
+    parseTagValue: false,
     ...defaultXmlCommonOptions,
 };
-const defaultXmlBuildOptions = {
+export const defaultXmlBuildOptions = {
     ...defaultXmlCommonOptions,
     suppressBooleanAttributes: false,
     suppressEmptyNode: true,
@@ -36,19 +37,20 @@ const defaultXmlBuildOptions = {
     indentBy: '    ',
 };
 export default class XmlStorage {
-    sortFile = true;
+    sortFile;
     saveFile;
     loadFile;
     parser;
     builder;
     _cachedStore;
-    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, }) {
+    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, sortFile, }) {
         assert(saveFile, 'saveFile callback is required to create a storage');
         assert(loadFile, 'loadFile callback is required to create a storage');
         this.parser = new XMLParser({ ...defaultXmlParserOptions, ...xmlParserOptions });
         this.builder = new XMLBuilder({ ...defaultXmlBuildOptions, ...xmlBuildOptions });
         this.saveFile = saveFile;
         this.loadFile = loadFile;
+        this.sortFile = sortFile ?? true;
     }
     clearCache() {
         delete this._cachedStore;
@@ -59,6 +61,10 @@ export default class XmlStorage {
         }
         this.persist(false);
     }
+    merge(source) {
+        assert(typeof source === 'object', 'Storage `merge` method only accept objects');
+        this._cachedStore = merge({}, this.store, source);
+    }
     sort() { }
     persist(sort = this.sortFile) {
         if (this._cachedStore) {
@@ -77,10 +83,6 @@ export default class XmlStorage {
             this._cachedStore = this.parser.parse(this.loadFile());
         }
     }
-    merge(source) {
-        assert(typeof source === 'object', 'Storage `merge` method only accept objects');
-        this._cachedStore = merge({}, this.store, source);
-    }
     mergeContent(existing, newContent) {
         return newContent ? { ...existing, ...this.parser.parse(newContent) } : existing;
     }

package/dist/generators/maven/support/dependabot-maven.js

@@ -17,19 +17,20 @@
  * limitations under the License.
  */
 import { XMLParser } from 'fast-xml-parser';
+import { defaultXmlParserOptions } from '../internal/xml-store.js';
 /**
  * Extract properties from pom content
  * @param pomContent
  */
 export function getPomProperties(pomContent) {
-    return new XMLParser().parse(pomContent).project.properties;
+    return new XMLParser(defaultXmlParserOptions).parse(pomContent).project.properties;
 }
 /**
  * Extract version properties from pom content
  * @param fileContent
  */
 export function parseMavenPom(fileContent) {
-    return new XMLParser().parse(fileContent);
+    return new XMLParser(defaultXmlParserOptions).parse(fileContent);
 }
 /**
  * Extract version properties from pom content

package/dist/generators/maven/support/index.js

@@ -18,4 +18,5 @@
  */
 export * from './dependabot-maven.js';
 export { default as PomStorage } from './pom-store.js';
+export * from './pom-file-sort.js';
 export * from './pom-store.js';