Changed Java 7 JDK from OpenJDK to Oracle

.travis.yml

@@ -185,7 +185,6 @@ before_install:
   - pip install requests
   - echo "127.0.0.1 " `hostname` | sudo tee /etc/hosts
   - echo "127.0.0.1 localhost" | sudo tee /etc/hosts
-  - sudo service cassandra start
 
 services:
   - postgresql

toolset/setup/linux/languages/java7.sh

@@ -9,13 +9,16 @@ RETCODE=$(fw_exists ${IROOT}/java7.installed)
 JAVA=$IROOT/java7
 
 # TODO: Someday move away from apt-get
+sudo add-apt-repository -y ppa:webupd8team/java
+sudo apt-get update
 # First remove java6
 sudo apt-get remove -y --purge openjdk-6-jre openjdk-6-jre-headless
 # Then install java7
-sudo apt-get install -y openjdk-7-jdk
+echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
+sudo apt-get install -y oracle-java7-installer
 
 # Setup environment variables
-echo "export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-`dpkg --print-architecture`" > $IROOT/java7.installed
+echo "export JAVA_HOME=/usr/lib/jvm/java-7-oracle" > $IROOT/java7.installed
 echo -e "export PATH=\$JAVA_HOME/bin:\$PATH" >> $IROOT/java7.installed
 
 source $IROOT/java7.installed

toolset/setup/linux/languages/java8.sh

@@ -13,7 +13,7 @@ echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | su
 sudo apt-get install -y oracle-java8-installer
 
 # set Java 7 (OpenJDK) as the default, as before.
-J7_HOME=/usr/lib/jvm/java-7-openjdk-`dpkg --print-architecture`
+J7_HOME=/usr/lib/jvm/java-7-oracle
 sudo update-alternatives --set java $J7_HOME/jre/bin/java
 sudo update-alternatives --set javac $J7_HOME/bin/javac