maven git commit: [MNG-6255] Maven script cannot parse jvm.config with CRLF

[gb...@apache.org]

Repository: maven
Updated Branches:
  refs/heads/MNG-6255 [created] c24ddf969


[MNG-6255] Maven script cannot parse jvm.config with CRLF

Both \r and \n should also be replaced with a space to deal with CRLF line endings properly


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c24ddf96
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c24ddf96
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c24ddf96

Branch: refs/heads/MNG-6255
Commit: c24ddf969f9b4971e7d1e564066e6dd198f91327
Parents: b100257
Author: Andrew Donald Kennedy <an...@gmail.com>
Authored: Mon Jul 10 16:58:33 2017 +0100
Committer: Guillaume Boué <gb...@apache.org>
Committed: Tue Jul 18 19:52:06 2017 +0200

----------------------------------------------------------------------
 apache-maven/src/bin/mvn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/c24ddf96/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index fa6164b..a554c66 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -167,7 +167,7 @@ find_file_argument_basedir() {
 # concatenates all lines of a file
 concat_lines() {
   if [ -f "$1" ]; then
-    echo "`tr -s '\n' ' ' < "$1"`"
+    echo "`tr -s '\r\n' '  ' < "$1"`"
   fi
 }