To avoid issues with Git for Windows autocrlf it is safer to clean up any windows line breaks when reading an existing violations file (the files will still count as modified to Git in this case because the line breaks have changed from crlf to lf, but at least the test does not fail in strange ways)

Signed-off-by: Peter Gafert <[email protected]>

Author: codecholeric

archunit/src/main/java/com/tngtech/archunit/library/freeze/ViolationStoreFactory.java

@@ -155,15 +155,24 @@ public List<String> getViolations(ArchRule rule) {
         }
 
         private List<String> readLines(String ruleDetailsFileName) {
+            String violationsText = readStoreFile(ruleDetailsFileName);
+            List<String> lines = Splitter.on(UNESCAPED_LINE_BREAK_PATTERN).splitToList(violationsText);
+            return unescape(lines);
+        }
+
+        private String readStoreFile(String fileName) {
             try {
-                String violationsText = new String(toByteArray(new File(storeFolder, ruleDetailsFileName)), UTF_8);
-                List<String> lines = Splitter.on(UNESCAPED_LINE_BREAK_PATTERN).splitToList(violationsText);
-                return unescape(lines);
+                String result = new String(toByteArray(new File(storeFolder, fileName)), UTF_8);
+                return ensureUnixLineBreaks(result);
             } catch (IOException e) {
                 throw new StoreReadException(e);
             }
         }
 
+        private String ensureUnixLineBreaks(String string) {
+            return string.replaceAll("\r\n", "\n");
+        }
+
         private static class FileSyncedProperties {
             private final File propertiesFile;
             private final Properties loadedProperties;