Merge pull request #457 from guusdk/master

Making Travis happy

.travis.yml

@@ -2,4 +2,11 @@ sudo: false
 language: java
 jdk:
   - oraclejdk8
-script: ant -Dhalt.on.plugin.error=true -f build/build.xml openfire test plugins
+env:
+  - ENVTARGET=compile
+  - ENVTARGET=test
+  - ENVTARGET=openfire
+  - ENVTARGET=plugins
+
+script: ant -Dhalt.on.plugin.error=true -f build/build.xml clean $ENVTARGET 
+

build/build.xml

@@ -215,6 +215,7 @@
 
     <patternset id="test.sources">
         <include name="**/*Test.java"/>
+        <exclude name="**/CheckChainTrustedTest.java" if="skipResourceIntensiveTests"/>
     </patternset>
 
     <patternset id="web.sources">