propagate from branch 'i2p.i2p.unittests' (head 58a62605ce8542f7e5d5daf0c2e171ed0c7e1a74)

            to branch 'i2p.i2p.zzz.update' (head 269547972f0e02fe545296823602995465bb0691)

core/java/build.xml

@@ -105,7 +105,20 @@
     </target>
     <!-- jars with tests -->
     <target name="jarScalaTest" depends="scalatest.compileTest">
-        <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
+        <mkdir dir="./build/obj_scala_jar" />
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj/*" to="*" />
+        </copy>
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj_scala/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj_scala/*" to="*" />
+        </copy>
+        <jar destfile="./build/i2pscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" />
     </target>
     <target name="jarTest" depends="junit.compileTest">
         <jar destfile="./build/i2ptest.jar" basedir="./build/obj" includes="**/*.class" />

router/java/build.xml

@@ -131,7 +131,20 @@
     </target>
     <!-- jars with tests -->
     <target name="jarScalaTest" depends="scalatest.compileTest">
-        <jar destfile="./build/routerscalatest.jar" basedir="./build/obj" includes="**/*.class ../obj_scala/**/*.class" />
+        <mkdir dir="./build/obj_scala_jar" />
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj/*" to="*" />
+        </copy>
+        <copy todir="./build/obj_scala_jar">
+            <fileset dir="./build/">
+                <include name="obj_scala/**/*.class"/>
+            </fileset>
+            <mapper type="glob" from="obj_scala/*" to="*" />
+        </copy>
+        <jar destfile="./build/routerscalatest.jar" basedir="./build/obj_scala_jar" includes="**/*.class" />
     </target>
     <target name="jarTest" depends="junit.compileTest">
         <jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />