From 458125606a32b62e212a11aa2633579ce2d54c99 Mon Sep 17 00:00:00 2001
From: Robert Haines <rhaines@manchester.ac.uk>
Date: Tue, 30 Dec 2014 12:25:42 +0000
Subject: [PATCH 1/3] Use the faster containerized Travis infrastructure.

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6c0d1a6..bc60d74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
@@ -18,7 +20,5 @@ before_install:
   - gem update --system
   - gem --version
 before_script:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq zip unzip
   - echo `whereis zip`
   - echo `whereis unzip`

From b0409a177788d7dbf56ab126e0b777f2daa66f59 Mon Sep 17 00:00:00 2001
From: Robert Haines <rhaines@manchester.ac.uk>
Date: Tue, 30 Dec 2014 12:48:46 +0000
Subject: [PATCH 2/3] Update ruby version in the Travis configuration.

The last in the 2.1 branch is 2.1.5 and 2.2.0 has now been released.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bc60d74..c7ee776 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,8 @@ cache: bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
+  - 2.1.5
+  - 2.2.0
   - ruby-head
   - rbx-2
 matrix:

From 82548dfc23d4abff5c6469adaea5104d9d3c8a90 Mon Sep 17 00:00:00 2001
From: Robert Haines <rhaines@manchester.ac.uk>
Date: Tue, 30 Dec 2014 13:02:17 +0000
Subject: [PATCH 3/3] Workaround for Travis/RVM JRuby issue.

Specify a version for JRuby as per:
https://github.com/travis-ci/travis-ci/issues/3067

Using version 1.7.18 would require uninstalling and reinstalling JRuby (see
thread above) which would be done for every entry in the build matrix, even the
non-JRuby ones. So use 1.7.17 for now.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7ee776..450349b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,9 @@ rvm:
   - rbx-2
 matrix:
   include:
-  - rvm: jruby-19mode
+  - rvm: jruby-1.7.17-19mode
     jdk: oraclejdk7
-  - rvm: jruby-19mode
+  - rvm: jruby-1.7.17-19mode
     jdk: openjdk7
   allow_failures:
     - rvm: ruby-head