This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git
The following commit(s) were added to refs/heads/2.3-gae by this push:
new e34c270 [FREEMARKER-187] Build failed on some systems due to
character encoding issue
e34c270 is described below
commit e34c270336bcecf5c8258960b113038e195d470f
Author: ddekany <[email protected]>
AuthorDate: Wed Sep 29 08:41:30 2021 +0200
[FREEMARKER-187] Build failed on some systems due to character encoding
issue
---
build.xml | 1 +
src/main/java/freemarker/core/DefaultTruncateBuiltinAlgorithm.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index a9a29de..f70b987 100644
--- a/build.xml
+++ b/build.xml
@@ -487,6 +487,7 @@
failonerror="true"
charset="UTF-8"
docencoding="UTF-8"
+ encoding="UTF-8"
locale="en_US"
>
<link href="http://docs.oracle.com/javase/8/docs/api/"/>
diff --git a/src/main/java/freemarker/core/DefaultTruncateBuiltinAlgorithm.java
b/src/main/java/freemarker/core/DefaultTruncateBuiltinAlgorithm.java
index 279e037..99625b5 100644
--- a/src/main/java/freemarker/core/DefaultTruncateBuiltinAlgorithm.java
+++ b/src/main/java/freemarker/core/DefaultTruncateBuiltinAlgorithm.java
@@ -86,8 +86,8 @@ public class DefaultTruncateBuiltinAlgorithm extends
TruncateBuiltinAlgorithm {
STANDARD_ASCII_TERMINATOR, STANDARD_M_TERMINATOR, true);
/**
- * Instance uses that {@code "[…]"} as the {@code defaultTerminator}
constructor argument, which contains
- * ellipsis character ({@code "…"}, U+2026), and thus only works with
UTF-8, and the cp125x charsets (like
+ * Instance that uses {@code "[\u2026]"} as the {@code defaultTerminator}
constructor argument, which contains
+ * ellipsis character ({@code "\u2026"}, U+2026), and thus only works with
UTF-8, and the cp125x charsets (like
* cp1250), and with some other rarely used ones. It does not work
(becomes to a question mark) with ISO-8859-x
* charsets (like ISO-8859-1), which are probably the most often used
charsets after UTF-8.
*
