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

[dblevins]

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

dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 4e435e0d57e98bd2ff664b605f64253dbd8bf677
Author: David Blevins <dblev...@tomitribe.com>
AuthorDate: Fri May 13 19:13:11 2022 -0700

    Use system line endings in GenerateBoms to reduce git status noise
---
 .../test/java/org/apache/tomee/bootstrap/GenerateBoms.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 299f245904..e0afbc5e73 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);
             }
@@ -595,7 +596,7 @@ public class GenerateBoms {
                     "      <groupId>" + groupId + "</groupId>\n" +
                     "      <artifactId>" + artifactId + "</artifactId>\n" +
                     "      <version>" + version + "</version>\n" +
-                   (classifier != null ? "      <classifier>" + classifier + 
"</classifier>\n" : "") +
+                    (classifier != null ? "      <classifier>" + classifier + 
"</classifier>\n" : "") +
                     "      <exclusions>\n" +
                     "        <exclusion>\n" +
                     "          <artifactId>*</artifactId>\n" +
@@ -616,7 +617,7 @@ public class GenerateBoms {
                     "      <groupId>" + groupId + "</groupId>\n" +
                     "      <artifactId>" + artifactId + "</artifactId>\n" +
                     "      <version>" + version + "</version>\n" +
-                   (classifier != null ? "      <classifier>" + classifier + 
"</classifier>\n" : "") +
+                    (classifier != null ? "      <classifier>" + classifier + 
"</classifier>\n" : "") +
                     "    </dependency>\n";
         }
     }