build

build.xml

@@ -11,7 +11,7 @@
 
 	<!-- MAIN JOBS -->
 	
-	<target name="build-all" depends="clean,jar" description="Compiles and packages the Worker Jar">
+	<target name="build-all" depends="clean,jar,test" description="Compiles and packages the Worker Jar">
 	</target>
 
 	<target name="clean" description="Removes artifacts from previous builds">
@@ -28,28 +28,25 @@
 				<attribute name="Class-Path" value="."/>
 				<attribute name="Can-Redefine-Classes" value="true"/>
 			</manifest>
-			<fileset dir="${build.dir}">
-				<exclude name="*common*.jar"/>
-			</fileset>
-			<fileset dir="lib">
-				<include name="*LICENSE*"/>
-			</fileset>
+			<fileset dir="${build.dir}" excludes="*common*.jar" />
+			<fileset dir="lib" includes="*LICENSE*" />
 			<zipfileset excludes="META-INF/*.SF" src="lib/disruptor-3.2.0.jar"/>
 			<zipfileset excludes="META-INF/*.SF" src="${build.dir}/explorviz-common.jar"/>
 		</jar>
 	</target>
 		
-	<target name="compile" depends="copy-from-common">
-		<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="classpath" includeantruntime="false" />
-	</target>
-	
-	<target name="copy-from-common">
-		<ant antfile="${common-monitoring.dir}/build.xml" dir="${common-monitoring.dir}" />
+	<target name="compile" depends="build-all-common">
+		<mkdir dir="${build.dir}" />
 		
-		<mkdir dir="${build.dir}"/>
 		<copy todir="${build.dir}">
     	  <fileset dir="${common-monitoring.dir}/dist"/>
     	</copy>
+		
+		<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="classpath" includeantruntime="false" />
+	</target>
+	
+	<target name="build-all-common" unless="isJenkins">
+		<ant antfile="${common-monitoring.dir}/build.xml" dir="${common-monitoring.dir}" />
 	</target>
 	
 	<path id="classpath">
@@ -61,7 +58,7 @@
 	
 	<!-- TEST JOBS -->
 	
-    <target name="test" depends="clean,compile-tests" description="JUnit-Tests">
+    <target name="test" depends="compile-tests" description="JUnit-Tests">
 		<mkdir dir="${test.reports}" />
 		<junit printsummary="yes" fork="yes" haltonfailure="no">        
 			<classpath>
@@ -77,12 +74,7 @@
     </target>
 	
 	<target name="compile-tests" depends="compile">
-		<mkdir dir="${build.dir}"/>
-        <javac srcdir="${test.src}" destdir="${build.dir}" includeantruntime="false">
-			<classpath>
-				<path refid="testclasspath"/>
-			</classpath>
-		</javac>
+        <javac srcdir="${test.src}" destdir="${build.dir}" classpathref="testclasspath" includeantruntime="false" />
     </target>
 	
 	<path id="testclasspath">