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

commit 68837351d39ca1ee332512c38c3cfedcb76311c4
Author: Siegfried Goeschl <siegfried.goes...@gmail.com>
AuthorDate: Mon Jul 6 15:14:44 2020 +0200

    FREEMARKER-151 [freemarker-cli] Ensure that build and and examples are 
running on Windows
---
 .../apache/freemarker/generator/base/file/RecursiveFileSupplier.java   | 3 ++-
 .../org/apache/freemarker/generator/datasource/DataSourceTest.java     | 2 +-
 2 files changed, 3 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 d532df8..1bb6a65 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
@@ -25,6 +25,7 @@ import org.apache.commons.io.filefilter.WildcardFileFilter;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -71,7 +72,7 @@ public class RecursiveFileSupplier implements 
Supplier<List<File>> {
         return sources.stream()
                 .map(this::resolve)
                 .flatMap(Collection::stream)
-                .sorted()
+                .sorted(Comparator.comparing(File::getAbsolutePath))
                 .collect(toList());
     }
 
diff --git 
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
 
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
index bf2753c..cff981b 100644
--- 
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
+++ 
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
@@ -67,7 +67,7 @@ public class DataSourceTest {
             assertEquals("pom", dataSource.getBaseName());
             assertEquals("xml", dataSource.getExtension());
             assertEquals(ANY_FILE.toURI().toString(), 
dataSource.getUri().toString());
-            assertEquals(Charset.defaultCharset(), dataSource.getCharset());
+            assertEquals(ANY_CHAR_SET.name(), dataSource.getCharset().name());
             assertEquals("application/xml", dataSource.getContentType());
             assertTrue(dataSource.getLength() > 0);
             assertFalse(dataSource.getText().isEmpty());