merge of '12cc77e1d7d2318fa071cb9fa3741d9f64abf475'

     and '7b7931f18c15ffa3b7afb35470d5d0dfd5714f30'

router/java/build.xml

@@ -22,9 +22,17 @@
             </classpath>
         </depend>
     </target>
+    <target name="dependVersion">
+        <!-- Force the dependency on the RouterVersion as depend doesn't recognize constant changes  -->
+        <dependset>
+             <srcfilelist dir="." files="build/obj/net/i2p/router/RouterVersion.class" />
+             <targetfilelist dir="." files="build/obj/net/i2p/router/Router.class" />
+             <targetfilelist dir="." files="build/obj/net/i2p/router/StatisticsManager.class" />
+        </dependset>
+    </target>
     <!-- only used if not set by a higher build.xml -->
     <property name="javac.compilerargs" value="" />
-    <target name="compile" depends="depend">
+    <target name="compile" depends="depend, dependVersion">
         <mkdir dir="./build" />
         <mkdir dir="./build/obj" />
         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" classpath="../../core/java/build/i2p.jar" >