From 866fddeb1868fac8af9b79d96ffb729432c71ed1 Mon Sep 17 00:00:00 2001
From: Eric Milles <eric.milles@thomsonreuters.com>
Date: Tue, 16 Jun 2026 14:12:52 -0500
Subject: [PATCH] dependencyManagement before dependencies when missing form
 template

---
 .../parser/m2/PomModuleDescriptorWriter.java     | 16 ++++++++--------
 .../core/module/descriptor/IvyMakePomTest.java   | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
index ce223f9c..5b7741a6 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorWriter.java
@@ -141,25 +141,25 @@ public final class PomModuleDescriptorWriter {
                     }
 
                     if (line.contains("</dependencies>")) {
-                        if (!dependenciesPrinted && !dependencyManagement) {
-                            printDependencies(md, out, options, indent, false);
-                            dependenciesPrinted = true;
-                        }
                         if (!overridesPrinted && dependencyManagement) {
                             printOverrides(md, out, indent, false);
                             overridesPrinted = true;
                         }
+                        if (!dependenciesPrinted && !dependencyManagement) {
+                            printDependencies(md, out, options, indent, false);
+                            dependenciesPrinted = true;
+                        }
                     }
 
                     if (line.contains("</project>")) {
-                        if (!dependenciesPrinted) {
-                            printDependencies(md, out, options, lastIndent, true);
-                            dependenciesPrinted = true;
-                        }
                         if (!overridesPrinted) {
                             printOverrides(md, out, lastIndent, true);
                             overridesPrinted = true;
                         }
+                        if (!dependenciesPrinted) {
+                            printDependencies(md, out, options, lastIndent, true);
+                            dependenciesPrinted = true;
+                        }
                     }
                 }
                 out.println(line);
diff --git a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
index 1d932da4..0395d527 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
@@ -143,14 +143,6 @@ public class IvyMakePomTest {
             "  <artifactId>name</artifactId>",
             "  <packaging>jar</packaging>",
             "  <version>1.0.0-SNAPSHOT</version>",
-            "  <dependencies>",
-            "    <dependency>",
-            "      <groupId>org.springframework</groupId>",
-            "      <artifactId>spring-aop</artifactId>",
-            "      <version>6.2.9</version>",
-            "      <scope>compile</scope>",
-            "    </dependency>",
-            "  </dependencies>",
             "  <dependencyManagement>",
             "    <dependencies>",
             "      <dependency>",
@@ -160,6 +152,14 @@ public class IvyMakePomTest {
             "      </dependency>",
             "    </dependencies>",
             "  </dependencyManagement>",
+            "  <dependencies>",
+            "    <dependency>",
+            "      <groupId>org.springframework</groupId>",
+            "      <artifactId>spring-aop</artifactId>",
+            "      <version>6.2.9</version>",
+            "      <scope>compile</scope>",
+            "    </dependency>",
+            "  </dependencies>",
             "</project>",
             ""
         };