From b2aa649c2a20c51aec55573ad73d757ddaaf5bb6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 19 Dec 2019 11:19:52 +0000
Subject: [PATCH] Build: Add encoding to all javac targets

---
 apps/addressbook/build.xml                   | 1 +
 apps/desktopgui/build.xml                    | 2 ++
 apps/i2pcontrol/build.xml                    | 2 ++
 apps/i2psnark/java/build.xml                 | 2 ++
 apps/i2ptunnel/java/build.xml                | 6 ++++++
 apps/imagegen/identicon/build.xml            | 2 ++
 apps/imagegen/imagegen/build.xml             | 1 +
 apps/imagegen/zxing/build.xml                | 3 +++
 apps/jetty/build.xml                         | 2 ++
 apps/jrobin/java/build.xml                   | 1 +
 apps/ministreaming/java/build.xml            | 4 ++++
 apps/routerconsole/java/build.xml            | 5 +++++
 apps/sam/java/build.xml                      | 2 ++
 apps/streaming/java/build.xml                | 2 ++
 apps/susidns/src/build.xml                   | 3 +++
 apps/susimail/build.xml                      | 2 ++
 apps/systray/java/build.xml                  | 1 +
 core/java/build.xml                          | 4 ++++
 installer/java/build.xml                     | 1 +
 installer/lib/izpack5/patches/java/build.xml | 1 +
 installer/tools/java/build.xml               | 1 +
 router/java/build.xml                        | 2 ++
 22 files changed, 50 insertions(+)

diff --git a/apps/addressbook/build.xml b/apps/addressbook/build.xml
index bf4e527131..673937ddfb 100644
--- a/apps/addressbook/build.xml
+++ b/apps/addressbook/build.xml
@@ -41,6 +41,7 @@
 	<target name="compile" depends="init, depend, warUpToDate">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                        includeAntRuntime="false"
+                       encoding="UTF-8"
                        srcdir="${src}" destdir="${build}">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
diff --git a/apps/desktopgui/build.xml b/apps/desktopgui/build.xml
index 02196c4162..5633a430b9 100644
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -28,6 +28,7 @@
         <target name="compile" depends="init">
             <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                        includeAntRuntime="false"
+                       encoding="UTF-8"
                        srcdir="${src}" destdir="${build}">
                 <compilerarg line="${javac.compilerargs}" />
                 <classpath>
@@ -52,6 +53,7 @@
             </exec>
             <javac source="${javac.version}" target="${javac.version}" 
                    includeAntRuntime="false"
+                   encoding="UTF-8"
                    srcdir="${build}/messages-src" destdir="${build}">
                 <compilerarg line="${javac.compilerargs}" />
             </javac>
diff --git a/apps/i2pcontrol/build.xml b/apps/i2pcontrol/build.xml
index 234face913..0a5b988a1e 100644
--- a/apps/i2pcontrol/build.xml
+++ b/apps/i2pcontrol/build.xml
@@ -59,6 +59,7 @@
             srcdir="./java" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" 
             classpath="${cp}">
             <compilerarg line="${javac.compilerargs}" />
@@ -77,6 +78,7 @@
             srcdir="./java" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" 
             classpath="${cpSocket}">
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/i2psnark/java/build.xml b/apps/i2psnark/java/build.xml
index 68cdd6ed49..a1d92a73ec 100644
--- a/apps/i2psnark/java/build.xml
+++ b/apps/i2psnark/java/build.xml
@@ -42,6 +42,7 @@
             srcdir="./src" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
+            encoding="UTF-8"
             includeAntRuntime="false" >
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
@@ -164,6 +165,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-src" destdir="build/obj">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
diff --git a/apps/i2ptunnel/java/build.xml b/apps/i2ptunnel/java/build.xml
index a95878aa0b..954d76e9a9 100644
--- a/apps/i2ptunnel/java/build.xml
+++ b/apps/i2ptunnel/java/build.xml
@@ -42,6 +42,7 @@
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -57,6 +58,7 @@
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             classpath="../../../core/java/build/i2p.jar:build/i2ptunnel.jar:../../jetty/jettylib/jetty-i2p.jar:../../jetty/jettylib/jetty-util.jar:../../jetty/jettylib/jetty-xml.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -166,6 +168,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-src" destdir="../jsp/WEB-INF/classes">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -210,6 +213,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-proxy-src" destdir="build/obj">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -347,6 +351,7 @@
         </java>
         <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
@@ -411,6 +416,7 @@
         <!-- We need the ant runtime, as it includes junit -->
         <javac srcdir="./src:./test/junit" debug="true" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="true"
+               encoding="UTF-8"
                deprecation="on" destdir="./build/obj" >
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
diff --git a/apps/imagegen/identicon/build.xml b/apps/imagegen/identicon/build.xml
index 831b3ff7f3..2c77186377 100644
--- a/apps/imagegen/identicon/build.xml
+++ b/apps/imagegen/identicon/build.xml
@@ -25,6 +25,7 @@
         <mkdir dir="./build/obj" />
         <javac srcdir="./core/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="./build/obj" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -37,6 +38,7 @@
             srcdir="./test/junit"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./buildTest/obj"
             classpath="./build/identicon.jar" >
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/imagegen/imagegen/build.xml b/apps/imagegen/imagegen/build.xml
index bc0d96f24f..fb66aefb42 100644
--- a/apps/imagegen/imagegen/build.xml
+++ b/apps/imagegen/imagegen/build.xml
@@ -36,6 +36,7 @@
         <mkdir dir="./build/WEB-INF/classes" />
         <javac srcdir="./webapp/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="false"
+               encoding="UTF-8"
  	       classpathref="cp"
                destdir="./build/WEB-INF/classes" >
             <compilerarg line="${javac.compilerargs}" />
diff --git a/apps/imagegen/zxing/build.xml b/apps/imagegen/zxing/build.xml
index c615d86839..879fe2af97 100644
--- a/apps/imagegen/zxing/build.xml
+++ b/apps/imagegen/zxing/build.xml
@@ -25,11 +25,13 @@
         <mkdir dir="./build/obj" />
         <javac srcdir="./core/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="./build/obj" >
             <compilerarg line="${javac.compilerargs7}" />
         </javac>
         <javac srcdir="./javase/src/main/java" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="./build/obj" classpath="./build/obj" >
             <compilerarg line="${javac.compilerargs7}" />
         </javac>
@@ -42,6 +44,7 @@
             srcdir="./test/junit"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./buildTest/obj"
             classpath="./build/zxing.jar" >
             <compilerarg line="${javac.compilerargs7}" />
diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index 7e2628a670..ce11cbff97 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -387,6 +387,7 @@
             srcdir="./java/src" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
+            encoding="UTF-8"
             includeAntRuntime="false" >
             <classpath>
                 <pathelement location="../../core/java/build/i2p.jar" />
@@ -470,6 +471,7 @@
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/objPatches" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             classpath="" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
diff --git a/apps/jrobin/java/build.xml b/apps/jrobin/java/build.xml
index 71400da64e..94d641c31e 100644
--- a/apps/jrobin/java/build.xml
+++ b/apps/jrobin/java/build.xml
@@ -35,6 +35,7 @@
             target="${javac.version}"
             destdir="./build/obj"
             includeAntRuntime="false"
+            encoding="UTF-8"
             includes="**/*.java" >
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
diff --git a/apps/ministreaming/java/build.xml b/apps/ministreaming/java/build.xml
index 244abe2edc..b418bd6345 100644
--- a/apps/ministreaming/java/build.xml
+++ b/apps/ministreaming/java/build.xml
@@ -36,6 +36,7 @@
         <!-- half of this is deprecated classes so turn deprecation off -->
         <javac srcdir="./src" debug="true" deprecation="off" source="${javac.version}" target="${javac.version}"
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -48,6 +49,7 @@
             srcdir="./demo"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./buildDemo/obj"
             classpath="../../../core/java/build/i2p.jar:./build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs}" />
@@ -122,6 +124,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-src" destdir="build/obj">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -214,6 +217,7 @@
             srcdir="./test/junit"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" >
             <classpath>
                 <pathelement path="${javac.classpath}" />
diff --git a/apps/routerconsole/java/build.xml b/apps/routerconsole/java/build.xml
index 1ffaa1d4e1..08207ae676 100644
--- a/apps/routerconsole/java/build.xml
+++ b/apps/routerconsole/java/build.xml
@@ -58,6 +58,7 @@
             srcdir="./src" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
@@ -95,6 +96,7 @@
             includes="net/i2p/router/news/*.java"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
@@ -177,6 +179,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-src" destdir="build/obj">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -234,6 +237,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-news-src" destdir="build/obj">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -253,6 +257,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-countries-src" destdir="build/obj">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
diff --git a/apps/sam/java/build.xml b/apps/sam/java/build.xml
index 6382cb3fdb..f9191c44fb 100644
--- a/apps/sam/java/build.xml
+++ b/apps/sam/java/build.xml
@@ -35,6 +35,7 @@
             srcdir="./src" 
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs7}" />
@@ -46,6 +47,7 @@
             srcdir="./test" 
             debug="true" deprecation="on" source="1.7" target="1.7" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" 
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs7}" />
diff --git a/apps/streaming/java/build.xml b/apps/streaming/java/build.xml
index 3a0fa18ef9..e639ffb01f 100644
--- a/apps/streaming/java/build.xml
+++ b/apps/streaming/java/build.xml
@@ -32,6 +32,7 @@
             srcdir="./src"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj"
             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
             <compilerarg line="${javac.compilerargs}" />
@@ -60,6 +61,7 @@
             srcdir="./test/junit"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" >
             <classpath>
                 <pathelement path="${javac.classpath}" />
diff --git a/apps/susidns/src/build.xml b/apps/susidns/src/build.xml
index d50d0fb8bb..5cb5afb0c7 100644
--- a/apps/susidns/src/build.xml
+++ b/apps/susidns/src/build.xml
@@ -48,6 +48,7 @@
 		<mkdir dir="${bin}" />
 		<javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
 			includeAntRuntime="false"
+			encoding="UTF-8"
  			classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" >
 			<compilerarg line="${javac.compilerargs}" />
 		</javac>
@@ -89,6 +90,7 @@
         </java>
         <javac debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="${bin}" srcdir="${tmp}" includes="**/*.java" classpathref="cp">
 		<compilerarg line="${javac.compilerargs}" />
          </javac>
@@ -183,6 +185,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-src" destdir="${bin}">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
diff --git a/apps/susimail/build.xml b/apps/susimail/build.xml
index 33deda2d74..e7fbdb63dc 100644
--- a/apps/susimail/build.xml
+++ b/apps/susimail/build.xml
@@ -40,6 +40,7 @@
             srcdir="./src/src"
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./src/WEB-INF/classes">
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
@@ -136,6 +137,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-src" destdir="src/WEB-INF/classes">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
diff --git a/apps/systray/java/build.xml b/apps/systray/java/build.xml
index 8d00ba1f8b..31e22ff353 100644
--- a/apps/systray/java/build.xml
+++ b/apps/systray/java/build.xml
@@ -34,6 +34,7 @@
             target="${javac.version}"
             destdir="./build/obj"
             includeAntRuntime="false"
+            encoding="UTF-8"
             includes="**/*.java"
             classpath="../../../core/java/build/i2p.jar" >
             <compilerarg line="${javac.compilerargs}" />
diff --git a/core/java/build.xml b/core/java/build.xml
index c341525899..9c6ab61cfc 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -79,6 +79,7 @@
         <javac sourcepath="" srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="./build/obj" classpath="${javac.classpath.mod}" >
             <compilerarg line="${javac.compilerargs}" />
             <include name="**/*.java" />
@@ -149,6 +150,7 @@
         </exec>
         <javac source="${javac.version}" target="${javac.version}" 
                includeAntRuntime="false"
+               encoding="UTF-8"
                srcdir="build/messages-src" destdir="build/obj">
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -268,6 +270,7 @@
         <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="true"
+               encoding="UTF-8"
                excludes="${source.exclude}"
                destdir="./build/obj" >
             <classpath>
@@ -488,6 +491,7 @@
         <javac srcdir="./bench" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="./build/obj_bench" >
             <classpath>
                 <pathelement location="${jmh.home}/jmh-core.jar" />
diff --git a/installer/java/build.xml b/installer/java/build.xml
index e73ff9036e..4b504375e1 100644
--- a/installer/java/build.xml
+++ b/installer/java/build.xml
@@ -26,6 +26,7 @@
         <mkdir dir="./build/obj" />
         <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" classpath="${javac.classpath}:../../core/java/build/obj" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
diff --git a/installer/lib/izpack5/patches/java/build.xml b/installer/lib/izpack5/patches/java/build.xml
index 4b30018087..3362bb486f 100644
--- a/installer/lib/izpack5/patches/java/build.xml
+++ b/installer/lib/izpack5/patches/java/build.xml
@@ -29,6 +29,7 @@
         <mkdir dir="./build/obj" />
         <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" >
             <compilerarg line="${javac.compilerargs}" />
             <classpath>
diff --git a/installer/tools/java/build.xml b/installer/tools/java/build.xml
index 40d8514a77..20ac5b20e5 100644
--- a/installer/tools/java/build.xml
+++ b/installer/tools/java/build.xml
@@ -26,6 +26,7 @@
         <mkdir dir="./build/obj" />
         <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
             includeAntRuntime="false"
+            encoding="UTF-8"
             destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
diff --git a/router/java/build.xml b/router/java/build.xml
index 38bcca6a8f..70f401bf9a 100644
--- a/router/java/build.xml
+++ b/router/java/build.xml
@@ -42,6 +42,7 @@
         <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
                debuglevel="lines,vars,source"
                includeAntRuntime="false"
+               encoding="UTF-8"
                destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
@@ -190,6 +191,7 @@
         <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
             debuglevel="lines,vars,source"
             includeAntRuntime="true"
+            encoding="UTF-8"
             destdir="./build/obj">
             <classpath>
                 <pathelement path="${javac.classpath}" />