[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/867e5d50 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/867e5d50 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/867e5d50 Branch: refs/heads/MNG-6069 Commit: 867e5d50be0bca17b1ba23c78e8c7c6d74c6aecd Parents: a03489b Author: Andrew Donald Kennedy <andrew.internatio...@gmail.com> Authored: Mon Jul 10 16:58:33 2017 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Sat Feb 10 11:42:31 2018 +0100 ---------------------------------------------------------------------- apache-maven/src/bin/mvn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/867e5d50/apache-maven/src/bin/mvn ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index e3a5848..65be711 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 }
