From c9058c78ae7d19cb847430e28a944cef115ff73e Mon Sep 17 00:00:00 2001
From: Eric Milles <eric.milles@thomsonreuters.com>
Date: Tue, 16 Jun 2026 13:29:46 -0500
Subject: [PATCH] next line continue

---
 src/etc/checkstyle/checkstyle-config                          | 3 +++
 .../ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java    | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/etc/checkstyle/checkstyle-config b/src/etc/checkstyle/checkstyle-config
index 624a0de9..e797e5cb 100644
--- a/src/etc/checkstyle/checkstyle-config
+++ b/src/etc/checkstyle/checkstyle-config
@@ -110,6 +110,9 @@
       <property name="allowUnchecked" value="true"/>
     </module>
     -->
+    <module name="OneStatementPerLine">
+        <property name="treatTryResourcesAsStatement" value="true"/>
+    </module>
     <module name="SimplifyBooleanExpression"/>
     <module name="SimplifyBooleanReturn"/>
 
diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
index 25cb3deb..a6002542 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
@@ -412,7 +412,9 @@ public final class XmlModuleDescriptorUpdater {
                 write("<" + qName);
                 if (options.isMerge() && path.equals("ivy-module")) {
                     for (int i = 0, n = attributes.getLength(); i < n; i += 1) {
-                        if (attributes.getQName(i).startsWith("xmlns:")) continue;
+                        if (attributes.getQName(i).startsWith("xmlns:")) {
+                            continue; // written next from namespace map
+                        }
                         write(" " + attributes.getQName(i) + "=\"" + substitute(settings, attributes.getValue(i)) + "\"");
                     }
                     Map<String, String> namespaces = options.getMergedDescriptor().getExtraAttributesNamespaces();