Merge branch 'master' into algorithm_loading

HPI-Information-Systems · Jun 5, 2014 · 31b8b24 · 31b8b24
2 parents 399b72f + 2672408
commit 31b8b24
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,5 +12,4 @@ script: "mvn -q clean verify"
 
 after_success:
   - mvn coveralls:cobertura
-  - if [[ "$TRAVIS_BRANCH" != "master" && "$TRAVIS_JDK_VERSION" != "oraclejdk7" ]]; then echo "Deployments are only done for the master branch and oraclejdk7. "; exit 0; fi
-  - mvn deploy --settings deploysettings.xml
+  - if [[ "$TRAVIS_BRANCH" != "master" && "$TRAVIS_JDK_VERSION" != "oraclejdk7" ]]; then echo "Deployments are only done for the master branch and oraclejdk7. "; exit 0; else mvn deploy --settings deploysettings.xml; fi