Merge branch 'feat/v2-matching-engine' into v4.7.x

rholshausen · rholshausen · commit bddd784ca453 · 2025-07-16T14:38:58.000+10:00
diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/XmlUtils.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/XmlUtils.kt
@@ -129,7 +129,7 @@ object XmlUtils {
     t.setOutputProperty(OutputKeys.INDENT, "yes")
     val buffer = StringWriter()
     t.transform(DOMSource(node), StreamResult(buffer))
-    return buffer.toString().trim()
+    return buffer.toString().replace("\r", "").trim()
   }
 
   /** Group the child nodes by tag name */

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ object XmlUtils {`
`129`	`129`	`t.setOutputProperty(OutputKeys.INDENT, "yes")`
`130`	`130`	`val buffer = StringWriter()`
`131`	`131`	`t.transform(DOMSource(node), StreamResult(buffer))`
`132`		`- return buffer.toString().trim()`
	`132`	`+ return buffer.toString().replace("\r", "").trim()`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/** Group the child nodes by tag name */`