Index: /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml
===================================================================
--- /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml	(revision 35038)
+++ /applications/editors/josm/plugins/CustomizePublicTransportStop/build.xml	(revision 35039)
@@ -7,36 +7,12 @@
     <property name="plugin.main.version" value="14153"/>
 
+    <property name="plugin.author" value="Rodion Scherbakov"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.customizepublictransportstop.CustomizePublicTransportStopPlugin"/>
+    <property name="plugin.description" value="Customization of public public transport stops."/>
+    <property name="plugin.icon" value="images/bus.png"/>
+    <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/CustomizePublicTransportStop"/>
+
     <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
 
-    <!-- creates the .jar file of the plugin -->
-    <target name="dist" depends="compile,revision">
-        <echo message="creating ${ant.project.name}.jar ... "/>
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
-        <copy todir="${plugin.build.dir}">
-            <fileset dir=".">
-                <include name="GPL-v3.0.txt" />
-                <include name="GPL-v2.0.txt" />
-            </fileset>
-        </copy>
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifestencoding="UTF-8">
-            <manifest>
-                <attribute name="Author" value="Rodion Scherbakov"/>
-                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.customizepublictransportstop.CustomizePublicTransportStopPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Customization of public public transport stops."/>
-                <attribute name="Plugin-Link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/CustomizePublicTransportStop"/>
-                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-                <attribute name="Plugin-Icon" value="images/bus.png"/>
-                <attribute name="ru_Plugin-Description" value="Настройка остановки общественного транспорта в соответствии со стандартом" />
-            </manifest>
-        </jar>
-    </target>
-
 </project>
Index: /applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- /applications/editors/josm/plugins/mapdust/build.xml	(revision 35038)
+++ /applications/editors/josm/plugins/mapdust/build.xml	(revision 35039)
@@ -6,4 +6,11 @@
     <property name="apidoc.dir" value="doc"/>
 
+    <property name="plugin.author" value="Beata Jancso"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.mapdust.MapdustPlugin"/>
+    <property name="plugin.description" value="The MapDust Plug-In shows the MapDust bug reports on the map. You can create, close,invalidate, re-open and comment bug reports by using this plugin."/>
+    <property name="plugin.icon" value="images/dialogs/mapdust_icon25.png"/>
+    <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/MapDust"/>
+    <property name="plugin.requires" value="gson"/>
+
     <!--
     **********************************************************
@@ -12,5 +19,5 @@
     -->
     <import file="../build-common.xml"/>
-  
+
     <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
         <include name="gson.jar"/>
@@ -23,35 +30,10 @@
     </target>
 
-    <!-- creates the .jar file of the plugin -->
-    <target name="dist" depends="compile,revision">
-        <echo message="creating ${ant.project.name}.jar ... "/>
+    <target name="setup-dist">
+        <antcall target="setup-dist-default" />
         <copy todir="${plugin.build.dir}">
             <fileset dir="conf"/>
         </copy>
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
-        <copy todir="${plugin.build.dir}">
-            <fileset dir=".">
-                <include name="README"/>
-                <include name="LICENSE"/>
-            </fileset>
-        </copy>
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifestencoding="UTF-8">
-            <manifest>
-                <attribute name="Author" value="Beata Jancso"/>
-                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.mapdust.MapdustPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="The MapDust Plug-In shows the MapDust bug reports on the map. You can create, close,invalidate, re-open and comment bug reports by using this plugin."/>
-                <attribute name="Plugin-Link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/MapDust"/>
-                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Requires" value="gson"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-                <attribute name="Plugin-Icon" value="images/dialogs/mapdust_icon25.png"/>
-            </manifest>
-        </jar>
     </target>
+
 </project>
Index: /applications/editors/josm/plugins/roadsigns/build.xml
===================================================================
--- /applications/editors/josm/plugins/roadsigns/build.xml	(revision 35038)
+++ /applications/editors/josm/plugins/roadsigns/build.xml	(revision 35039)
@@ -5,4 +5,11 @@
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="14153"/>
+
+    <property name="plugin.author" value="Paul Hartmann"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.roadsigns.RoadSignsPlugin"/>
+    <property name="plugin.description" value="Plugin for tagging of objects based on a selection of road signs. The dialog can be opened by clicking a small icon in the upper right corner of the properties window. Available country presets: Belgium, Germany, Poland, Slovakia, Spain."/>
+    <property name="plugin.icon" value="images/pref/roadsigns.png"/>
+    <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/RoadSigns"/>
+    <property name="plugin.canloadatruntime" value="true"/>
 
     <!--
@@ -13,44 +20,3 @@
     <import file="../build-common.xml"/>
 
-    <!--
-    **********************************************************
-    ** dist - creates the plugin jar
-    **********************************************************
-    -->
-    <target name="dist" depends="compile,revision">
-        <echo message="creating ${ant.project.name}.jar ... "/>
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
-        <copy todir="${plugin.build.dir}">
-            <fileset dir=".">
-                <include name="README"/>
-                <include name="LICENSE"/>
-            </fileset>
-        </copy>
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifestencoding="UTF-8">
-            <!--
-            ************************************************
-            ** configure these properties. Most of them will be copied to the plugins
-            ** manifest file. Property values will also show up in the list available
-            ** plugins: https://josm.openstreetmap.de/wiki/Plugins.
-            **
-            ************************************************
-            -->
-            <manifest>
-                <attribute name="Author" value="Paul Hartmann"/>
-                <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.roadsigns.RoadSignsPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Plugin for tagging of objects based on a selection of road signs. The dialog can be opened by clicking a small icon in the upper right corner of the properties window. Available country presets: Belgium, Germany, Poland, Slovakia, Spain."/>
-                <attribute name="Plugin-Icon" value="images/pref/roadsigns.png"/>
-                <attribute name="Plugin-Link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/RoadSigns"/>
-                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-                <attribute name="Plugin-Canloadatruntime" value="true"/>
-            </manifest>
-        </jar>
-    </target>
 </project>
Index: /applications/editors/josm/plugins/routing/build.xml
===================================================================
--- /applications/editors/josm/plugins/routing/build.xml	(revision 35038)
+++ /applications/editors/josm/plugins/routing/build.xml	(revision 35039)
@@ -7,4 +7,11 @@
     <property name="plugin.main.version" value="14153"/>
 
+    <property name="plugin.author" value="Jose Vidal &lt;vidalfree@gmail.com&gt;, Juangui Jordán &lt;juangui@gmail.com&gt;, Hassan S &lt;hassan.sabirin@gmail.com&gt;"/>
+    <property name="plugin.class" value="com.innovant.josm.plugin.routing.RoutingPlugin"/>
+    <property name="plugin.description" value="Provides routing capabilities."/>
+    <property name="plugin.icon" value="images/preferences/routing.png"/>
+    <property name="plugin.link" value="https://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
+    <property name="plugin.requires" value="log4j"/>
+
     <!--
     **********************************************************
@@ -14,62 +21,15 @@
     <import file="../build-common.xml"/>
 
-    <!-- classpath -->
-    <path id="classpath">
-        <fileset dir="${plugin.lib.dir}" includes="**/*.jar"/>
-        <pathelement path="${josm}"/>
-        <fileset dir="../log4j/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
-    <!--
-    **********************************************************
-    ** compile - complies the source tree
-    ** Overrides the target from build-common.xml
-    **********************************************************
-    -->
-    <target name="compile" depends="init">
-        <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac srcdir="src" classpathref="classpath" debug="true" destdir="${plugin.build.dir}" includeantruntime="false">
-            <compilerarg value="-Xlint:deprecation"/>
-            <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-    </target>
+    <fileset id="plugin.requires.jars" dir="${plugin.dist.dir}">
+        <include name="log4j.jar"/>
+    </fileset>
 
-    <!-- Generate distribution -->
-    <target name="dist" depends="compile,revision" description="Generate distribution">
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/">
+    <target name="setup-dist">
+        <antcall target="setup-dist-default" />
+        <copy todir="${plugin.build.dir}">
             <fileset dir="resources">
                 <include name="*.xml"/>
             </fileset>
         </copy>
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifestencoding="UTF-8">
-        <!--
-        ************************************************
-        ** configure these properties. Most of them will be copied to the plugins
-        ** manifest file. Property values will also show up in the list available
-        ** plugins: https://josm.openstreetmap.de/wiki/Plugins.
-        **
-        ************************************************
-        -->
-            <manifest>
-                <attribute name="Author" value="Jose Vidal &lt;vidalfree@gmail.com&gt;, Juangui Jordán &lt;juangui@gmail.com&gt;, Hassan S &lt;hassan.sabirin@gmail.com&gt;"/>
-                <attribute name="Plugin-Class" value="com.innovant.josm.plugin.routing.RoutingPlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Provides routing capabilities."/>
-                <attribute name="Plugin-Icon" value="images/preferences/routing.png"/>
-                <attribute name="Plugin-Link" value="https://wiki.openstreetmap.org/index.php/JOSM/Plugins/Routing"/>
-                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Stage" value="50"/>
-                <attribute name="Plugin-Requires" value="log4j"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-            </manifest>
-            <zipfileset src="${plugin.lib.dir}/jgrapht-jdk1.5.jar"/>
-        </jar>
     </target>
 </project>
Index: /applications/editors/josm/plugins/sds/build.xml
===================================================================
--- /applications/editors/josm/plugins/sds/build.xml	(revision 35038)
+++ /applications/editors/josm/plugins/sds/build.xml	(revision 35039)
@@ -7,4 +7,10 @@
     <property name="plugin.main.version" value="14153"/>
 
+    <property name="plugin.author" value="Frederik Ramm"/>
+    <property name="plugin.class" value="org.openstreetmap.hot.sds.SeparateDataStorePlugin"/>
+    <property name="plugin.description" value="Loads data from SDS"/>
+    <property name="plugin.icon" value="images/sds.png"/>
+    <!--<property name="plugin.link" value=""/>-->
+
     <!--
     **********************************************************
@@ -14,23 +20,3 @@
     <import file="../build-common.xml"/>
 
-    <target name="dist" depends="compile,revision">
-        <copy todir="${plugin.build.dir}/images">
-            <fileset dir="images"/>
-        </copy>
-        <copy todir="${plugin.build.dir}/data">
-            <fileset dir="data"/>
-        </copy>
-        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifestencoding="UTF-8">
-            <manifest>
-                <attribute name="Author" value="Frederik Ramm"/>
-                <attribute name="Plugin-Class" value="org.openstreetmap.hot.sds.SeparateDataStorePlugin"/>
-                <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Loads data from SDS" />
-                <attribute name="Plugin-Icon" value="images/sds.png"/>
-                <!--<attribute name="Plugin-Link" value=""/>-->
-                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
-                <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
-            </manifest>
-        </jar>
-    </target>
 </project>