From 8f24a793edf5c7e4d8364981a70e25a7161d6fcc Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Mon, 20 Jul 2015 10:00:46 +0200
Subject: [PATCH] Trying to fix the build on jdk7

---
 .travis.yml |  3 +--
 Dockerfile  | 14 --------------
 travis.sh   | 11 ++++++-----
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/.travis.yml b/.travis.yml
index c7f2d88..41efeed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,7 @@ language: java
 sudo: false
 
 jdk:
-  - oraclejdk8
-  - openjdk7
+  - oraclejdk7
 
 install: true
 script: ./travis.sh
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 2487af2..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM maven:3.2-jdk-7
-
-RUN apt-get update && apt-get install -y \
-  bzip2 \
-  vim \
-  jq
-
-ENV TESTS SONARQUBE_SNAPSHOT
-ENV PATH ~/.local/bin:$PATH
-
-WORKDIR /root
-CMD ["./travis.sh"]
-
-ADD . /root/
diff --git a/travis.sh b/travis.sh
index 7f2d537..87f9bfe 100755
--- a/travis.sh
+++ b/travis.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 function installTravisTools {
-  curl -sSL https://raw.githubusercontent.com/sonarsource/travis-utils/v11/install.sh | bash
+  curl -sSL https://raw.githubusercontent.com/sonarsource/travis-utils/v12/install.sh | bash
   source /tmp/travis-utils/env.sh
 }
 
@@ -11,18 +11,19 @@ case "$TESTS" in
 
 CI)
   installTravisTools
+
   travis_build_green "SonarSource/sonarqube" "master"
   mvn verify -B -e -V
   ;;
 
 IT-DEV)
-  cat /etc/hosts
-  rpm -qa | grep glibc
   installTravisTools
-  mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
+
   travis_build_green "SonarSource/sonarqube" "master"
+  mvn install -Dsource.skip=true -Denforcer.skip=true -Danimal.sniffer.skip=true -Dmaven.test.skip=true
+
   cd it
-  mvn -Dsonar.runtimeVersion="DEV" -DsonarRunner.version="2.5-SNAPSHOT" -Dmaven.test.redirectTestOutputToFile=false install
+  mvn -DsonarRunner.version="2.5-SNAPSHOT" -Dsonar.runtimeVersion="DEV" -Dmaven.test.redirectTestOutputToFile=false install
   ;;
 
 esac
-- 
2.39.5