[tomee] 03/04: Use system line endings in GenerateBoms to reduce git status noise

[rzo1]

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit ed2e042e651c67443883af3f7642f4e382963296
Author: David Blevins <dblev...@tomitribe.com>
AuthorDate: Sat May 14 04:13:11 2022 +0200

    Use system line endings in GenerateBoms to reduce git status noise
    
    (cherry picked from commit 4e435e0d57e98bd2ff664b605f64253dbd8bf677)
---
 .../src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java 
b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
index e077f62de7..ca2a82712a 100644
--- 
a/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
+++ 
b/tomee/apache-tomee/src/test/java/org/apache/tomee/bootstrap/GenerateBoms.java
@@ -17,8 +17,6 @@
 package org.apache.tomee.bootstrap;
 
 import lombok.Data;
-import lombok.Getter;
-import lombok.ToString;
 import org.apache.openejb.loader.Files;
 import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.JarLocation;
@@ -139,7 +137,10 @@ public class GenerateBoms {
         for (File file : srcConf.listFiles()) {
             if (file.getName().endsWith(".original")) continue;
             try {
-                IO.copy(file, new File(destConf, file.getName()));
+                // Read the content and update the line endings to reduce
+                // git status pollution as these files are checked in
+                final String content = IO.slurp(file).replaceAll("\r\n|\n", 
System.lineSeparator());
+                IO.copy(IO.read(content), new File(destConf, file.getName()));
             } catch (IOException e) {
                 throw new UncheckedIOException("Cannot copy configuration 
file: " + file.getName(), e);
             }