diff --git a/src/main/scala/com/github/sbt/sbom/BomTask.scala b/src/main/scala/com/github/sbt/sbom/BomTask.scala index 01461dc..74c17d3 100644 --- a/src/main/scala/com/github/sbt/sbom/BomTask.scala +++ b/src/main/scala/com/github/sbt/sbom/BomTask.scala @@ -32,8 +32,8 @@ abstract class BomTask[T](protected val properties: BomTaskProperties) { val params: BomExtractorParams = extractorParams(currentConfiguration) val bom: Bom = new BomExtractor(params, report, log).bom val bomText: String = bomFormat match { - case BomFormat.Json => BomGeneratorFactory.createJson(schemaVersion, bom).toJsonString - case BomFormat.Xml => BomGeneratorFactory.createXml(schemaVersion, bom).toXmlString + case BomFormat.Json => BomGeneratorFactory.createJson(schemaVersion, bom).toJsonString.replaceAll("\r?\n", "\n") + case BomFormat.Xml => BomGeneratorFactory.createXml(schemaVersion, bom).toXmlString.replaceAll("\r?\n", "\n") } logBomInfo(params, bom) bomText diff --git a/src/sbt-test/dependencies/compile/build.sbt b/src/sbt-test/dependencies/compile/build.sbt index 8b3df47..1ecebdb 100644 --- a/src/sbt-test/dependencies/compile/build.sbt +++ b/src/sbt-test/dependencies/compile/build.sbt @@ -22,5 +22,5 @@ lazy val checkTask = Def.task { s.log.info("Verifying bom content...") makeBom.value import scala.sys.process._ - require(Seq("diff", "-w", "target/bom.xml", s"${thisProject.value.base}/etc/bom.xml").! == 0) + require(Seq("diff", "target/bom.xml", s"${thisProject.value.base}/etc/bom.xml").! == 0) } diff --git a/src/sbt-test/dependencies/integrationTest/build.sbt b/src/sbt-test/dependencies/integrationTest/build.sbt index d29ea0b..e4c527a 100644 --- a/src/sbt-test/dependencies/integrationTest/build.sbt +++ b/src/sbt-test/dependencies/integrationTest/build.sbt @@ -23,6 +23,6 @@ lazy val checkTask = Def.task { val bomFile = (IntegrationTest / makeBom).value import scala.sys.process._ - require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0) + require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0) s.log.info(s"${bomFile.getPath} content verified") } diff --git a/src/sbt-test/dependencies/test/build.sbt b/src/sbt-test/dependencies/test/build.sbt index 6b9afe2..16e4137 100644 --- a/src/sbt-test/dependencies/test/build.sbt +++ b/src/sbt-test/dependencies/test/build.sbt @@ -23,6 +23,6 @@ lazy val checkTask = Def.task { val bomFile = (Test / makeBom).value import scala.sys.process._ - require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0) + require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.xml").! == 0) s.log.info(s"${bomFile.getPath} content verified") } diff --git a/src/sbt-test/dependenciesJson/compile/build.sbt b/src/sbt-test/dependenciesJson/compile/build.sbt index 1ae9054..900fce4 100644 --- a/src/sbt-test/dependenciesJson/compile/build.sbt +++ b/src/sbt-test/dependenciesJson/compile/build.sbt @@ -22,5 +22,5 @@ lazy val checkTask = Def.task { s.log.info("Verifying bom content...") makeBom.value import scala.sys.process._ - require(Seq("diff", "-w", "target/bom.json", s"${thisProject.value.base}/etc/bom.json").! == 0) + require(Seq("diff", "target/bom.json", s"${thisProject.value.base}/etc/bom.json").! == 0) } diff --git a/src/sbt-test/dependenciesJson/integrationTest/build.sbt b/src/sbt-test/dependenciesJson/integrationTest/build.sbt index 514bc5c..5747246 100644 --- a/src/sbt-test/dependenciesJson/integrationTest/build.sbt +++ b/src/sbt-test/dependenciesJson/integrationTest/build.sbt @@ -23,6 +23,6 @@ lazy val checkTask = Def.task { val bomFile = (IntegrationTest / makeBom).value import scala.sys.process._ - require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0) + require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0) s.log.info(s"${bomFile.getPath} content verified") } diff --git a/src/sbt-test/dependenciesJson/test/build.sbt b/src/sbt-test/dependenciesJson/test/build.sbt index 6199f8a..f5c523a 100644 --- a/src/sbt-test/dependenciesJson/test/build.sbt +++ b/src/sbt-test/dependenciesJson/test/build.sbt @@ -23,6 +23,6 @@ lazy val checkTask = Def.task { val bomFile = (Test / makeBom).value import scala.sys.process._ - require(Seq("diff", "-w", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0) + require(Seq("diff", bomFile.getPath, s"${thisProject.value.base}/etc/bom.json").! == 0) s.log.info(s"${bomFile.getPath} content verified") }