Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 7351)
+++ trunk/build.xml	(revision 7367)
@@ -169,6 +169,6 @@
         
         <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
-        	<!-- remove empty CFBundleDocumentTypes definition -->
-        	<remove path="/plist/dict/key[text()='CFBundleDocumentTypes']|/plist/dict/key[text()='CFBundleDocumentTypes']/following-sibling::array[1]"/>
+            <!-- remove empty CFBundleDocumentTypes definition -->
+            <remove path="/plist/dict/key[text()='CFBundleDocumentTypes']|/plist/dict/key[text()='CFBundleDocumentTypes']/following-sibling::array[1]"/>
             <!-- insert our own keys -->
             <insert position="before" path="/plist/dict/key[1]" file="macosx/JOSM.app/Contents/Info.plist_template.xml" />
@@ -237,5 +237,5 @@
             <compilerarg value="-Xlint:try"/>
             <compilerarg value="-Xlint:unchecked"/>
-        	<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
+            <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
         </javac>
@@ -283,5 +283,5 @@
         </fileset>
         <pathelement path="dist/josm-custom.jar"/>
-        <pathelement path="tools/groovy-all-2.3.4.jar"/>
+        <pathelement path="tools/groovy-all-2.3.6.jar"/>
     </path>
     <macrodef name="init-test-preferences">
@@ -322,5 +322,5 @@
                     <cp-elements/>
                 </classpath>
-                <javac target="1.7" source="1.7" debug="on">
+                <javac target="1.7" source="1.7" debug="on" encoding="UTF-8">
                     <compilerarg value="-Xlint:all"/>
                     <compilerarg value="-Xlint:-serial"/>
@@ -330,5 +330,5 @@
     </macrodef>
     <target name="test-compile" depends="test-init,dist">
-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.4.jar"/>
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="tools/groovy-all-2.3.6.jar"/>
         <call-groovyc testfamily="unit">
             <cp-elements>
@@ -355,4 +355,5 @@
             <jacoco:coverage destfile="${test.dir}/jacoco.exec">
                 <junit printsummary="yes" fork="true" forkmode="once">
+                    <jvmarg value="-Dfile.encoding=UTF-8"/>
                     <sysproperty key="josm.home" value="${test.dir}/config/@{testfamily}-josm.home"/>
                     <sysproperty key="josm.test.data" value="${test.dir}/data"/>
@@ -407,41 +408,41 @@
         <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar"/>
         <proguard>
-	 	-injars dist/josm-custom.jar
-	 	-outjars dist/josm-custom-optimized.jar
-
-	 	-libraryjars ${java.home}/lib/rt.jar
-	 	-libraryjars ${java.home}/lib/jce.jar
-
-	 	-dontoptimize
-	 	-dontobfuscate
-
-	 	# These options probably are not necessary (and make processing a bit slower)
-	 	-dontskipnonpubliclibraryclasses
-		-dontskipnonpubliclibraryclassmembers
-
-	 	-keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
-	 	    public static void main(java.lang.String[]);
-	 	}
-		-keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplet
-
-		-keep class JOSM
-	 	-keep class * extends org.openstreetmap.josm.io.FileImporter
-	 	-keep class * extends org.openstreetmap.josm.io.FileExporter
-		-keep class org.w3._2001.xmlschema.Adapter1
-		-keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
-
-	 	-keepclassmembers enum  * {
-	 	    public static **[] values();
-	 	    public static ** valueOf(java.lang.String);
-	 	}
-
-	 	# Keep unused public methods (can be useful for plugins)
-	 	-keepclassmembers class * {
-	 	    public protected *;
-	 	}
-
-		# Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
-		# This note should not be a problem as we don't use obfuscation
-		-dontnote
+        -injars dist/josm-custom.jar
+        -outjars dist/josm-custom-optimized.jar
+
+        -libraryjars ${java.home}/lib/rt.jar
+        -libraryjars ${java.home}/lib/jce.jar
+
+        -dontoptimize
+        -dontobfuscate
+
+        # These options probably are not necessary (and make processing a bit slower)
+        -dontskipnonpubliclibraryclasses
+        -dontskipnonpubliclibraryclassmembers
+
+        -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplication {
+            public static void main(java.lang.String[]);
+        }
+        -keepclasseswithmembers public class org.openstreetmap.josm.gui.MainApplet
+
+        -keep class JOSM
+        -keep class * extends org.openstreetmap.josm.io.FileImporter
+        -keep class * extends org.openstreetmap.josm.io.FileExporter
+        -keep class org.w3._2001.xmlschema.Adapter1
+        -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
+
+        -keepclassmembers enum  * {
+            public static **[] values();
+            public static ** valueOf(java.lang.String);
+        }
+
+        # Keep unused public methods (can be useful for plugins)
+        -keepclassmembers class * {
+            public protected *;
+        }
+
+        # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
+        # This note should not be a problem as we don't use obfuscation
+        -dontnote
         </proguard>
     </target>
@@ -452,5 +453,5 @@
         <property name="dir" value="plugin-check"/>
         <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
-            <classpath path="tools/animal-sniffer-ant-tasks-1.8.jar"/>
+            <classpath path="tools/animal-sniffer-ant-tasks-1.11.jar"/>
         </typedef>
         <mkdir dir="${dir}"/>
@@ -521,14 +522,26 @@
         </as:build-signatures>
         <as:check-signature signature="${dir}/api.sig">
+            <ignore classname="au.edu.*"/>
+            <ignore classname="au.com.*"/>
+            <ignore classname="com.*"/>
+            <ignore classname="javax.*"/>
+            <ignore classname="jogamp.*"/>
+            <ignore classname="junit.*"/>
+            <ignore classname="net.sf.*"/>
+            <ignore classname="nu.xom.*"/>
+            <ignore classname="org.apache.*"/>
+            <ignore classname="org.codehaus.*"/>
+            <ignore classname="org.dom4j.*"/>
+            <ignore classname="org.hsqldb.*"/>
+            <ignore classname="org.ibex.*"/>
+            <ignore classname="org.jaitools.*"/>
+            <ignore classname="org.jaxen.*"/>
+            <ignore classname="org.jdom2.*"/>
             <ignore classname="org.jgraph.*"/>
-            <ignore classname="com.touchgraph.*"/>
-            <ignore classname="com.sun.xml.fastinfoset.*"/>
-            <ignore classname="javax.jms.*"/>
+            <ignore classname="org.joda.time.*"/>
             <ignore classname="org.jvnet.staxex.*"/>
-            <ignore classname="javax.mail.*"/>
-            <ignore classname="com.sun.jdmk.*"/>
-            <ignore classname="org.apache.avalon.framework.logger.Logger"/>
-            <ignore classname="org.apache.log.*"/>
-            <ignore classname="junit.*"/>
+            <ignore classname="org.kxml2.*"/>
+            <ignore classname="org.python.*"/>
+            <ignore classname="org.slf4j.*"/>
             <path path="${dir}"/>
         </as:check-signature>