Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149

Explicitly specify encoding for the source files

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@792739 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/bayeux/build.xml b/modules/bayeux/build.xml
index bc017da..348bf96 100644 (file)
--- a/modules/bayeux/build.xml
+++ b/modules/bayeux/build.xml
@@ -97,7 +97,8 @@
            debug="${compile.debug}"
            deprecation="${compile.deprecation}"
            source="${compile.source}"
-           optimize="${compile.optimize}">
+           optimize="${compile.optimize}"
+           encoding="ISO-8859-1">
       <classpath refid="tomcat.bayeux.classpath" />
       <include name="org/apache/tomcat/bayeux/**" />
       <include name="org/apache/cometd/**" />
@@ -125,7 +126,8 @@
            debug="${compile.debug}"
            deprecation="${compile.deprecation}"
            source="${compile.source}"
-           optimize="${compile.optimize}">
+           optimize="${compile.optimize}"
+           encoding="ISO-8859-1">
       <classpath refid="tomcat.bayeux.classpath" />
       <include name="org/apache/tomcat/bayeux/**" />
       <include name="org/apache/cometd/**" />

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 79a5233..119694d 100644 (file)
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -100,7 +100,8 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
-           optimize="${compile.optimize}">
+           optimize="${compile.optimize}"
+           encoding="ISO-8859-1">
       <classpath refid="tomcat.jdbc.classpath"/>
       <include name="org/apache/tomcat/jdbc/**" />
     </javac>
@@ -131,7 +132,8 @@
            deprecation="${compile.deprecation}"
            source="${compile.source}"
            target="${compile.target}"
-           optimize="${compile.optimize}">
+           optimize="${compile.optimize}"
+           encoding="ISO-8859-1">
       <classpath refid="tomcat.jdbc.classpath"/>
       <classpath refid="test.classpath"/>
       <include name="org/apache/tomcat/jdbc/**" />

diff --git a/modules/tomcat-lite/build.xml b/modules/tomcat-lite/build.xml
index e6e28d5..2985fef 100644 (file)
--- a/modules/tomcat-lite/build.xml
+++ b/modules/tomcat-lite/build.xml
@@ -22,6 +22,7 @@
                source="${compile.source}"
                optimize="${compile.optimize}"
                srcdir="${tomcat.src}"
+               encoding="ISO-8859-1"
         >
             <include name="javax/servlet/**" />
             <include name="javax/annotation/**" />
@@ -36,6 +37,7 @@
                deprecation="${compile.deprecation}"
                source="${compile.source}"
                optimize="${compile.optimize}"
+               encoding="ISO-8859-1"
         >
             <src path="${tomcat.lite.src}/java" />
         </javac>