Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 16193)
+++ trunk/build.xml	(revision 16194)
@@ -220,5 +220,4 @@
             </manifest>
             <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
-            <zipfileset dir="${src.dir}/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images"/>
         </jar>
     </target>
@@ -328,31 +327,5 @@
         </javac>
     </target>
-    <target name="compile-jmapviewer" depends="init" description="Compiles JMapViewer">
-        <!-- JMapViewer -->
-        <javac sourcepath="" srcdir="${src.dir}" fork="yes"
-            excludes="com/**,oauth/**,org/apache/commons/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**"
-            destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
-            <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
-            <compilerarg line="-XDcompilePolicy=simple"/>
-            <compilerarg value="-processorpath"/>
-            <compilerarg pathref="processor.path"/>
-            <compilerarg value="-Xlint:cast"/>
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:dep-ann"/>
-            <compilerarg value="-Xlint:divzero"/>
-            <compilerarg value="-Xlint:empty"/>
-            <compilerarg value="-Xlint:finally"/>
-            <compilerarg value="-Xlint:overrides"/>
-            <!--<compilerarg value="-Xlint:rawtypes"/>-->
-            <compilerarg value="-Xlint:static"/>
-            <compilerarg value="-Xlint:try"/>
-            <compilerarg value="-Xlint:unchecked"/>
-            <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
-            <compilerarg value="-XDignore.symbol.file"/>
-            <compilerarg value="-Xplugin:ErrorProne -Xep:CatchAndPrintStackTrace:OFF -Xep:ReferenceEquality:OFF -Xep:StringSplitter:OFF -Xep:BadImport:OFF"/>
-            <compilerarg line="-Xmaxwarns 1000"/>
-        </javac>
-    </target>
-    <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer" unless="compile.notRequired" description="Compiles JOSM">
+    <target name="compile" depends="init,javacc,compile-cots" unless="compile.notRequired" description="Compiles JOSM">
         <!-- JOSM -->
         <javac sourcepath="" srcdir="${src.dir}" fork="yes"
@@ -400,5 +373,5 @@
                 classpathref="compile.path"
                 encoding="UTF-8"
-                packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
+                packagenames="org.openstreetmap.josm.*"
                 excludepackagenames="org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.*"
                 windowtitle="JOSM"
@@ -1111,4 +1084,5 @@
                 <exclude name="META-INF/**"/>
                 <exclude name="*"/>
+                <exclude name="org/openstreetmap/gui/jmapviewer/Demo*"/>
                 <exclude name="com/drew/imaging/FileTypeDetector*"/>
                 <exclude name="com/drew/imaging/ImageMetadataReader*"/>
@@ -1176,5 +1150,7 @@
         <jar destfile="${dist-sources.jar}" level="${clevel}">
             <zipgroupfileset refid="sources.fileset"/>
-            <fileset dir="${src.dir}"/>
+            <fileset dir="${src.dir}">
+                <exclude name="org/openstreetmap/gui/jmapviewer/**"/>
+            </fileset>
             <fileset dir="${resources.dir}"/>
             <fileset file="CONTRIBUTION"/>
Index: trunk/ivy.xml
===================================================================
--- trunk/ivy.xml	(revision 16193)
+++ trunk/ivy.xml	(revision 16194)
@@ -18,4 +18,5 @@
     <dependencies>
         <!-- api->default -->
+        <dependency org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.13" conf="api->default"/>
         <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="api->default"/>
         <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="api->default"/>
@@ -26,4 +27,5 @@
         <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.1" conf="api->default"/>
         <!-- sources->sources -->
+        <dependency org="org.openstreetmap.jmapviewer" name="jmapviewer" rev="2.13" conf="sources->sources"/>
         <dependency org="javax.json" name="javax.json-api" rev="1.1.4" conf="sources->sources"/>
         <dependency org="org.glassfish" name="javax.json" rev="1.1.4" conf="sources->sources"/>