Merge pull request #456 from guusdk/master

Do not depend on platform-provided junit integration for Ant.

build/build.xml

@@ -142,6 +142,9 @@
     <taskdef name="propertymerge" classname="org.jugbb.ant.propertymerge.PropertyMergeTask">
         <classpath refid="ant.dependencies" />
     </taskdef>
+    <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+        <classpath refid="ant.dependencies" />
+    </taskdef>
 
     <!-- ======================================================================================= -->
     <!-- PATHs / PATTERNSETs / FILTERSETs                                                        -->
@@ -657,7 +660,7 @@
 
         <!-- Run jUnit -->
         <mkdir dir="${test.results.dest.dir}"/>
-        <junit printsummary="yes" haltonfailure="yes" fork="yes" dir="${test.dest.dir}">
+        <junit printsummary="yes" haltonfailure="yes" fork="yes" dir="${test.dest.dir}" includeantruntime="false">
 	    <sysproperty key="openfireHome" value="${target.openfireHome}"/>
 
             <!-- We must add our own classes to the classpath for testing -->

src/test/java/org/jivesoftware/openfire/keystore/CheckChainTrustedTest.java

@@ -16,7 +16,6 @@ import java.util.List;
  *
  * @author Guus der Kinderen, guus.der.kinderen@gmail.com
  */
-@Ignore // These tests make the continuous integration on GitHub (Travis) fail.
 @RunWith( Parameterized.class )
 public class CheckChainTrustedTest
 {