From 6084079b6512245a6406a4c42edcec318e038d1b Mon Sep 17 00:00:00 2001
From: Marcelo Shima <marceloshima@gmail.com>
Date: Mon, 18 Mar 2024 18:32:05 -0300
Subject: [PATCH] reorder maven artifacts

---
 generators/maven/support/pom-store.ts | 29 ++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/generators/maven/support/pom-store.ts b/generators/maven/support/pom-store.ts
index 7e0922a1f1a2..75e7aced24c8 100644
--- a/generators/maven/support/pom-store.ts
+++ b/generators/maven/support/pom-store.ts
@@ -188,6 +188,25 @@ const ensureChild = (current: any, ...childPath) => {
   return current;
 };
 
+const reorderArtifact = <Artifact extends MavenArtifact = MavenArtifact>({
+  groupId,
+  artifactId,
+  inProfile,
+  version,
+  ...rest
+}: Artifact): Artifact => ({ inProfile, groupId, artifactId, version, ...rest }) as Artifact;
+
+const reorderDependency = <Dependency extends MavenDependency = MavenDependency>({
+  groupId,
+  artifactId,
+  inProfile,
+  version,
+  type,
+  scope,
+  classifier,
+  ...rest
+}: Dependency): Dependency => ({ inProfile, groupId, artifactId, version, type, scope, classifier, ...rest }) as Dependency;
+
 export default class PomStorage extends XmlStorage {
   constructor({ saveFile, loadFile }: { saveFile: (string) => void; loadFile: () => string }) {
     super({ saveFile, loadFile });
@@ -200,12 +219,12 @@ export default class PomStorage extends XmlStorage {
   }
 
   public addDependency({ inProfile, ...dependency }: MavenDependency): void {
-    this.addDependencyAt(this.getNode({ profile: inProfile }), dependency);
+    this.addDependencyAt(this.getNode({ profile: inProfile }), reorderDependency(dependency));
     this.persist();
   }
 
   public addDependencyManagement({ inProfile, ...dependency }: MavenDependency): void {
-    this.addDependencyAt(this.getNode({ profile: inProfile, nodePath: 'dependencyManagement' }), dependency);
+    this.addDependencyAt(this.getNode({ profile: inProfile, nodePath: 'dependencyManagement' }), reorderDependency(dependency));
     this.persist();
   }
 
@@ -268,7 +287,7 @@ export default class PomStorage extends XmlStorage {
       'configuration.annotationProcessorPaths',
     );
     const paths = ensureChildIsArray(annotationProcessorPaths, 'path');
-    appendOrReplace(paths, artifact, artifactEquals);
+    appendOrReplace(paths, reorderArtifact(artifact), artifactEquals);
     this.persist();
   }
 
@@ -282,12 +301,12 @@ export default class PomStorage extends XmlStorage {
 
   protected addDependencyAt(node, { additionalContent, ...dependency }: MavenDependency) {
     const dependencyArray = ensureChildIsArray(node, 'dependencies.dependency');
-    appendOrReplace(dependencyArray, this.mergeContent(dependency, additionalContent), dependencyEquals);
+    appendOrReplace(dependencyArray, this.mergeContent(reorderDependency(dependency), additionalContent), dependencyEquals);
   }
 
   protected addPluginAt(node, { additionalContent, ...artifact }: MavenPlugin) {
     const artifactArray = ensureChildIsArray(node, 'plugins.plugin');
-    appendOrReplace(artifactArray, this.mergeContent(artifact, additionalContent), artifactEquals);
+    appendOrReplace(artifactArray, this.mergeContent(reorderArtifact(artifact), additionalContent), artifactEquals);
   }
 
   protected addRepositoryAt(node, { releasesEnabled, snapshotsEnabled, ...repository }: MavenRepository): void {