another try

Author: rjernst

build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.java

@@ -101,9 +101,8 @@ public void testTemplate(String templateFilename, String outputFilename, List<Ch
             writeResource(outputFile, actualOutput);
             assertFalse("UPDATE_EXPECTED_OUTPUT should be set back to false after updating output", UPDATE_EXPECTED_OUTPUT);
         } else {
-            // expected resources files always contain \n newlines, but generated data has the system newline
-            String[] expectedLines = expectedOutput.split("\n");
-            String[] actualLines = actualOutput.split(System.lineSeparator());
+            String[] expectedLines = expectedOutput.replace("\r", "").split("\n");
+            String[] actualLines = actualOutput.split("\n");
 
             assertThat(actualLines, arrayContaining(expectedLines));
         }