[freemarker-generator] branch FREEMARKER-151 updated: FREEMARKER-151 [freemarker-cli] Ensure that build and and examples are running on Windows

[sgoeschl]

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 b299f1b  FREEMARKER-151 [freemarker-cli] Ensure that build and and 
examples are running on Windows
b299f1b is described below

commit b299f1b2e90686a4a6f0649beb2c526520621215
Author: Siegfried Goeschl <siegfried.goes...@gmail.com>
AuthorDate: Tue Jul 7 10:21:00 2020 +0200

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

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 1bb6a65..8a6481b 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,10 +69,11 @@ public class RecursiveFileSupplier implements 
Supplier<List<File>> {
             return emptyList();
         }
 
+        // sort the result to have a reproducible order across OS
         return sources.stream()
                 .map(this::resolve)
                 .flatMap(Collection::stream)
-                .sorted(Comparator.comparing(File::getAbsolutePath))
+                .sorted(Comparator.comparing(File::getName))
                 .collect(toList());
     }