Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 16396)
+++ trunk/build.xml	(revision 16397)
@@ -1069,5 +1069,7 @@
             <fileset refid="runtime.fileset"/>
             <patternset>
-                <exclude name="META-INF/**"/>
+                <exclude name="META-INF/*"/>
+                <exclude name="META-INF/maven/**"/>
+                <exclude name="META-INF/versions/**"/>
                 <exclude name="*"/>
                 <exclude name="org/openstreetmap/gui/jmapviewer/Demo*"/>
Index: trunk/ivy.xml
===================================================================
--- trunk/ivy.xml	(revision 16396)
+++ trunk/ivy.xml	(revision 16397)
@@ -24,5 +24,4 @@
         <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
         <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
-        <dependency conf="api->default" org="commons-logging" name="commons-logging" rev="1.2"/>
         <dependency conf="api->default" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
         <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.20"/>
@@ -35,5 +34,4 @@
         <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
         <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
-        <dependency conf="sources->sources" org="commons-logging" name="commons-logging" rev="1.2"/>
         <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
         <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.20"/>
