diff --git a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java index 5e5f3c391..48fbdfa33 100644 --- a/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java +++ b/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java @@ -317,7 +317,7 @@ public class FixCRLF extends MatchingTask implements ChainableReader { File tmpFile = FILE_UTILS.createTempFile("fixcrlf", "", null); tmpFile.deleteOnExit(); try { - FILE_UTILS.copyFile(srcFile, tmpFile, null, fcv, false, + FILE_UTILS.copyFile(srcFile, tmpFile, null, fcv, false, false, encoding, getProject()); File destFile = new File(destD, file); diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java index 513140f0e..baedcfd24 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2004 The Apache Software Foundation + * Copyright 2004-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public class CvsVersion extends AbstractCvsTask { private String serverVersion; private String clientVersionProperty; private String serverVersionProperty; - + /** * Get the CVS client version * @return CVS client version