Use Version 2 of TravisCI toolbelt

diff --git a/.travis.yml b/.travis.yml
index b3ab2939fe7f7832eaebfdf52fefb716ca30dae8..0269e61eacf5445de630dd1d8f68663887f6a919 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: java
-sudo: false
 install: true
 
 jdk:
@@ -16,6 +15,7 @@ script:
 cache:
   directories:
     - '$HOME/.m2/repository'
+
 before_cache:
   - 'rm -rf $HOME/.m2/repository/org/codehaus/sonar'
 

diff --git a/travis.sh b/travis.sh
index ca72dbb82b9d05baba34fb62647c2d4672359682..f79476ee6f77428395f091a50bc4deedfca8315c 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -3,8 +3,7 @@
 set -euo pipefail
 
 function installTravisTools {
-  curl -sSL https://raw.githubusercontent.com/dgageot/travis-utils/v1/install.sh | sh
-  source /tmp/travis-utils/utils.sh
+  curl -sSL https://raw.githubusercontent.com/dgageot/travis-utils/v2/install.sh | bash
 }
 
 case "$DATABASE" in
@@ -18,7 +17,7 @@ POSTGRES)
 
   psql -c 'create database sonar;' -U postgres
 
-  runDatabaseCI "postgresql" "jdbc:postgresql://localhost/sonar" "postgres" ''
+  travis_runDatabaseCI "postgresql" "jdbc:postgresql://localhost/sonar" "postgres" ''
   ;;
 
 MYSQL)
@@ -29,7 +28,7 @@ MYSQL)
   mysql -e "GRANT ALL ON sonar.* TO 'sonar'@'localhost';" -uroot
   mysql -e "FLUSH PRIVILEGES;" -uroot
 
-  runDatabaseCI "mysql" "jdbc:mysql://localhost/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance" "sonar" 'sonar'
+  travis_runDatabaseCI "mysql" "jdbc:mysql://localhost/sonar?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useConfigs=maxPerformance" "sonar" 'sonar'
   ;;
 
 *)