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

sgoeschl pushed a commit to branch FREEMARKER-151
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git


The following commit(s) were added to refs/heads/FREEMARKER-151 by this push:
     new 4e590dd  FREEMARKER-151 [freemarker-cli] Ensure that build and and 
examples are running on Windows
4e590dd is described below

commit 4e590dd9955c6d296a26f5213314b9b9ed33fec2
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Tue Jul 7 10:51:31 2020 +0200

    FREEMARKER-151 [freemarker-cli] Ensure that build and and examples are 
running on Windows
---
 .../apache/freemarker/generator/base/file/RecursiveFileSupplier.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
 
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
index 8a6481b..9ffb03c 100644
--- 
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
+++ 
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
@@ -69,11 +69,11 @@ public class RecursiveFileSupplier implements 
Supplier<List<File>> {
             return emptyList();
         }
 
-        // sort the result to have a reproducible order across OS
+        // sort the result to have a reproducible order across different OS
         return sources.stream()
                 .map(this::resolve)
                 .flatMap(Collection::stream)
-                .sorted(Comparator.comparing(File::getName))
+                .sorted(Comparator.comparing(File::getAbsolutePath))
                 .collect(toList());
     }
 

Reply via email to