From 03112efb44874f7a9bbd55ae7fd8d2ea483ad6fc Mon Sep 17 00:00:00 2001
From: theamodhshetty <theamodhshetty@gmail.com>
Date: Fri, 27 Feb 2026 11:56:27 +0530
Subject: [PATCH 1/2] Improve JUnit reporter metadata for CI parsers

---
 CHANGELOG.md                                           |  5 +++++
 .../SwiftLintFramework/Reporters/JUnitReporter.swift   |  4 ++--
 .../Resources/CannedJunitReporterOutput.xml            | 10 +++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3348c4e3b1..eaf248fb51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,11 @@
   [ahmadalfy](https://github.com/ahmadalfy)
   [#6499](https://github.com/realm/SwiftLint/issues/6499)
 
+* Add `name` on JUnit `testsuite` output and include a `line` attribute on
+  each `failure` element for better CI parser compatibility.  
+  [theamodhshetty](https://github.com/theamodhshetty)
+  [#6161](https://github.com/realm/SwiftLint/issues/6161)
+
 ### Bug Fixes
 
 * Ensure that disable commands work for `redundant_nil_coalescing` rule.  
diff --git a/Source/SwiftLintFramework/Reporters/JUnitReporter.swift b/Source/SwiftLintFramework/Reporters/JUnitReporter.swift
index c40066fb18..0b9348c86e 100644
--- a/Source/SwiftLintFramework/Reporters/JUnitReporter.swift
+++ b/Source/SwiftLintFramework/Reporters/JUnitReporter.swift
@@ -16,7 +16,7 @@ struct JUnitReporter: Reporter {
         return """
             <?xml version="1.0" encoding="utf-8"?>
             <testsuites failures="\(warningCount)" errors="\(errorCount)" tests="\(testCount)">
-            \t<testsuite failures="\(warningCount)" errors="\(errorCount)" tests="\(testCount)">
+            \t<testsuite name="SwiftLint" failures="\(warningCount)" errors="\(errorCount)" tests="\(testCount)">
             \(violations.map(testCase(for:)).joined(separator: "\n"))
             \t</testsuite>
             </testsuites>
@@ -32,7 +32,7 @@ struct JUnitReporter: Reporter {
 
         return """
             \t\t<testcase classname='Formatting Test' name='\(fileName)'>
-            \t\t\t<failure message='\(reason)'>\(message)</failure>
+            \t\t\t<failure message='\(reason)' line='\(lineNumber)'>\(message)</failure>
             \t\t</testcase>
             """
     }
diff --git a/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml b/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml
index 5c75dced0d..8ac78d2c4d 100644
--- a/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml
+++ b/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <testsuites failures="1" errors="3" tests="4">
-	<testsuite failures="1" errors="3" tests="4">
+	<testsuite name="SwiftLint" failures="1" errors="3" tests="4">
 		<testcase classname='Formatting Test' name='filename'>
-			<failure message='Violation Reason 1'>Warning:Line:1</failure>
+			<failure message='Violation Reason 1' line='1'>Warning:Line:1</failure>
 		</testcase>
 		<testcase classname='Formatting Test' name='filename'>
-			<failure message='Violation Reason 2'>Error:Line:1</failure>
+			<failure message='Violation Reason 2' line='1'>Error:Line:1</failure>
 		</testcase>
 		<testcase classname='Formatting Test' name='${CURRENT_WORKING_DIRECTORY}/path/file.swift'>
-			<failure message='Shorthand syntactic sugar should be used, i.e. [Int] instead of Array&lt;Int&gt;'>Error:Line:1</failure>
+			<failure message='Shorthand syntactic sugar should be used, i.e. [Int] instead of Array&lt;Int&gt;' line='1'>Error:Line:1</failure>
 		</testcase>
 		<testcase classname='Formatting Test' name='&lt;nopath&gt;'>
-			<failure message='Colons should be next to the identifier when specifying a type and next to the key in dictionary literals'>Error:Line:0</failure>
+			<failure message='Colons should be next to the identifier when specifying a type and next to the key in dictionary literals' line='0'>Error:Line:0</failure>
 		</testcase>
 	</testsuite>
 </testsuites>
\ No newline at end of file

From d111ba1fdfadfc051ef3a8f1b0379d8a0a74002e Mon Sep 17 00:00:00 2001
From: theamodhshetty <theamodhshetty@gmail.com>
Date: Fri, 27 Feb 2026 20:29:15 +0530
Subject: [PATCH 2/2] fix(junit): add root suite name and remove failure line
 attr

---
 CHANGELOG.md                                           |  4 ++--
 .../SwiftLintFramework/Reporters/JUnitReporter.swift   |  4 ++--
 .../Resources/CannedJunitReporterOutput.xml            | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eaf248fb51..fad8c57bea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,8 +25,8 @@
   [ahmadalfy](https://github.com/ahmadalfy)
   [#6499](https://github.com/realm/SwiftLint/issues/6499)
 
-* Add `name` on JUnit `testsuite` output and include a `line` attribute on
-  each `failure` element for better CI parser compatibility.  
+* Add `name="SwiftLint"` to JUnit `testsuites` and `testsuite` output for
+  better CI parser compatibility.  
   [theamodhshetty](https://github.com/theamodhshetty)
   [#6161](https://github.com/realm/SwiftLint/issues/6161)
 
diff --git a/Source/SwiftLintFramework/Reporters/JUnitReporter.swift b/Source/SwiftLintFramework/Reporters/JUnitReporter.swift
index 0b9348c86e..0ac1d8f689 100644
--- a/Source/SwiftLintFramework/Reporters/JUnitReporter.swift
+++ b/Source/SwiftLintFramework/Reporters/JUnitReporter.swift
@@ -15,7 +15,7 @@ struct JUnitReporter: Reporter {
 
         return """
             <?xml version="1.0" encoding="utf-8"?>
-            <testsuites failures="\(warningCount)" errors="\(errorCount)" tests="\(testCount)">
+            <testsuites name="SwiftLint" failures="\(warningCount)" errors="\(errorCount)" tests="\(testCount)">
             \t<testsuite name="SwiftLint" failures="\(warningCount)" errors="\(errorCount)" tests="\(testCount)">
             \(violations.map(testCase(for:)).joined(separator: "\n"))
             \t</testsuite>
@@ -32,7 +32,7 @@ struct JUnitReporter: Reporter {
 
         return """
             \t\t<testcase classname='Formatting Test' name='\(fileName)'>
-            \t\t\t<failure message='\(reason)' line='\(lineNumber)'>\(message)</failure>
+            \t\t\t<failure message='\(reason)'>\(message)</failure>
             \t\t</testcase>
             """
     }
diff --git a/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml b/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml
index 8ac78d2c4d..db64bdf072 100644
--- a/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml
+++ b/Tests/FileSystemAccessTests/Resources/CannedJunitReporterOutput.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<testsuites failures="1" errors="3" tests="4">
+<testsuites name="SwiftLint" failures="1" errors="3" tests="4">
 	<testsuite name="SwiftLint" failures="1" errors="3" tests="4">
 		<testcase classname='Formatting Test' name='filename'>
-			<failure message='Violation Reason 1' line='1'>Warning:Line:1</failure>
+			<failure message='Violation Reason 1'>Warning:Line:1</failure>
 		</testcase>
 		<testcase classname='Formatting Test' name='filename'>
-			<failure message='Violation Reason 2' line='1'>Error:Line:1</failure>
+			<failure message='Violation Reason 2'>Error:Line:1</failure>
 		</testcase>
 		<testcase classname='Formatting Test' name='${CURRENT_WORKING_DIRECTORY}/path/file.swift'>
-			<failure message='Shorthand syntactic sugar should be used, i.e. [Int] instead of Array&lt;Int&gt;' line='1'>Error:Line:1</failure>
+			<failure message='Shorthand syntactic sugar should be used, i.e. [Int] instead of Array&lt;Int&gt;'>Error:Line:1</failure>
 		</testcase>
 		<testcase classname='Formatting Test' name='&lt;nopath&gt;'>
-			<failure message='Colons should be next to the identifier when specifying a type and next to the key in dictionary literals' line='0'>Error:Line:0</failure>
+			<failure message='Colons should be next to the identifier when specifying a type and next to the key in dictionary literals'>Error:Line:0</failure>
 		</testcase>
 	</testsuite>
 </testsuites>
\ No newline at end of file