Repository: camel Updated Branches: refs/heads/master e2c48e4ba -> b600f9ce3
CAMEL-11194 Upgrade Checkstyle and update rules This removes any carriage return characters that might occur in `header.txt` due to platform differences which might generate checkstyle XML file with incorrect header checks. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b600f9ce Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b600f9ce Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b600f9ce Branch: refs/heads/master Commit: b600f9ce3721d6fb02e3b04c59cd4028ef028739 Parents: e2c48e4 Author: Zoran Regvart <zregv...@apache.org> Authored: Tue Jun 6 16:28:50 2017 +0200 Committer: Zoran Regvart <zregv...@apache.org> Committed: Tue Jun 6 16:28:50 2017 +0200 ---------------------------------------------------------------------- buildingtools/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b600f9ce/buildingtools/pom.xml ---------------------------------------------------------------------- diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml index c235e16..1d4104c 100644 --- a/buildingtools/pom.xml +++ b/buildingtools/pom.xml @@ -105,9 +105,9 @@ <scripts> <script><![CDATA[ import groovy.xml.XmlUtil - project.properties['header-java'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-java.txt').text.replace('\n', '\\n')) - project.properties['header-properties'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-properties.txt').text.replace('\n', '\\n')) - project.properties['header-xml'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-xml.txt').text.replaceAll('(.*)\n', '^\\\\Q$1\\\\E\\$\\\\n')) + project.properties['header-java'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-java.txt').text.replace('\r', '').replace('\n', '\\n')) + project.properties['header-properties'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-properties.txt').text.replace('\r', '').replace('\n', '\\n')) + project.properties['header-xml'] = XmlUtil.escapeXml(new File(project.basedir, 'src/main/resources/header-xml.txt').text.replace('\r', '').replaceAll('(.*)\n', '^\\\\Q$1\\\\E\\$\\\\n')) ]]></script> </scripts> </configuration>
