Merge branch 'release-2.7.x' of github.com:mongodb/mongo-java-driver into release-2.7.x

Author: jyemin

build.xml

@@ -17,6 +17,7 @@ limitations under the License.
 -->
 
 <project name="MongoDB Java Driver" default="compile" basedir=".">
+    <property environment="env"/>
 
     <property file="build.properties" prefix="build.conf"/>
 
@@ -28,6 +29,8 @@ limitations under the License.
     <property name="testdir" location="${targetdir}/test"/>
     <dirname property="javabase" file="${java.home}"/>
 
+    <property name="clover.jar" location="${env.CLOVER_HOME}/lib/clover.jar"/>
+    <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
     <path id="classpath">
         <fileset dir="lib"><include name="**/*.jar"/></fileset>
         <pathelement path="conf" />
@@ -36,6 +39,15 @@ limitations under the License.
         <pathelement path="${javabase}/lib/tools.jar" />
     </path>
 
+    <path id="classpath.clover">
+        <fileset dir="lib"><include name="**/*.jar"/></fileset>
+        <pathelement path="conf" />
+        <pathelement path="build/main" />
+        <pathelement path="build/test" />
+        <pathelement path="${javabase}/lib/tools.jar" />
+        <pathelement path="${clover.jar}" />
+    </path>
+
     <!-- ******************************************************************* -->
     <!-- The init target.                                                    -->
     <!-- ******************************************************************* -->
@@ -235,17 +247,6 @@ limitations under the License.
         </testng>
     </target>
 
-    <target name="bamboo-test" depends="compile,guard.noclover">
-        <testng classpathref="classpath" outputdir="${testdir}" listeners="com.mongodb.util.TestNGListener, com.cenqua.clover.tasks.testng.CloverOptimizedTestSelector" haltonfailure="false" >
-            <jvmarg value="-Xmx512M" />
-            <xmlfileset dir="." includes="testng.xml"/>
-        </testng> 
-	    <clover-report>
-	       <current outfile="coverage.xml">
-		  <format type="xml"/>
-	       </current>
-	    </clover-report>
-    </target>
 
     <target name="test-single" depends="compile">
         <condition property="propsSpecified">
@@ -312,26 +313,44 @@ limitations under the License.
     <!-- The reporting targets                                               -->
     <!-- ******************************************************************* -->
 
-    <target name="junit-reports" depends="test">
+    <target name="junit-reports" depends="compile">
+        <testng classpathref="classpath" outputdir="${testdir}" listeners="com.mongodb.util.TestNGListener" haltonfailure="false" >
+            <jvmarg value="-Xmx512M" />
+            <xmlfileset dir="." includes="testng.xml"/>
+        </testng>
         <junitreport todir="${testdir}">
             <fileset dir="${testdir}"><include name="*/*.xml"/></fileset>
             <report format="noframes"  todir="${testdir}"/>
         </junitreport>
     </target>
 
-  <!-- NOTE: publish-local is now located in maven/ -->
-	<taskdef resource="cloverlib.xml" classpath="lib/clover-3.1.0.jar"/>
-
-	<target name="-check.clover">
-		<available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
-	</target>
-
+	  	
+	  	
+    <target name="-check.clover">
+      <available property="clover.installed" classname="com.cenqua.clover.CloverInstr" />
+    </target>
+            
     <target name="with.clover" depends="guard.noclover">
         <clover-setup/>
     </target>
-	 
-	<target name="guard.noclover" depends="-check.clover" unless="clover.installed">
-		<fail message="The target you are attempting to run requires Clover, which doesn't appear to be installed"/>
-	</target>
+            
+    <target name="guard.noclover" depends="-check.clover" unless="clover.installed">
+      <fail message="The target you are attempting to run requires Clover, which doesn't appear to be installed"/>
+    </target>
+
+    <target name="jenkins-test" depends="with.clover,compile">
+
+        <testng classpathref="classpath.clover" outputdir="${testdir}" listeners="com.mongodb.util.TestNGListener, com.cenqua.clover.tasks.testng.CloverOptimizedTestSelector" haltonfailure="false" verbose="1">
+            <jvmarg value="-Xmx512M" />
+            <xmlfileset dir="." includes="testng.xml"/>
+        </testng>
+        <clover-report>
+            <current outfile="coverage.xml">
+                <format type="xml"/>
+            </current>
+        </clover-report>
+    </target>
+
+  <!-- NOTE: publish-local is now located in maven/ -->
 
 </project>