From 9d881f3ee23ddbf86a1c4919f0241961890c20f9 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@google.com>
Date: Fri, 17 Feb 2017 13:59:16 -0800
Subject: [PATCH 1/3] Give Maven a bit more memory

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

diff --git a/.travis.yml b/.travis.yml
index bdf2e33a92e..9c72ab75a47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,6 +44,8 @@ before_install:
   || true
 # Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!)
 - export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
+# Give Maven a bit more memory
+- export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g'
 # Skip the install step, since Maven will download the dependencies we need
 # when the test build runs.
 # http://stackoverflow.com/q/31945809/101923

From 920dff94e32b98c05bb15e6d6ff576c1df5f5682 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@google.com>
Date: Fri, 17 Feb 2017 15:00:18 -0800
Subject: [PATCH 2/3] Move how we set things.

---
 .travis.yml | 2 --
 travis.sh   | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9c72ab75a47..bdf2e33a92e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,8 +44,6 @@ before_install:
   || true
 # Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!)
 - export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
-# Give Maven a bit more memory
-- export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g'
 # Skip the install step, since Maven will download the dependencies we need
 # when the test build runs.
 # http://stackoverflow.com/q/31945809/101923
diff --git a/travis.sh b/travis.sh
index 60896e4d390..ee776fa8791 100755
--- a/travis.sh
+++ b/travis.sh
@@ -19,6 +19,9 @@ set -x
 set -o pipefail
 shopt -s globstar
 
+# Give Maven a bit more memory
+export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g'
+
 SKIP_TESTS=false
 if [ -z "$GOOGLE_APPLICATION_CREDENTIALS" ] ; then
   SKIP_TESTS=true
@@ -64,7 +67,8 @@ common_travis_dir="$(travis_changed_files_parent)"
 
 [ -z "$common_travis_dir" ] || pushd "$common_travis_dir"
 
-./mvnw  --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | egrep -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
+./mvnw  --batch-mode clean verify -e -DskipTests=$SKIP_TESTS
+# LV3-temp remove | egrep -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
 
 [ -z "$common_travis_dir" ] || popd
 

From bd0b92951335c7be004cba2f9cc254756cd4a236 Mon Sep 17 00:00:00 2001
From: Les Vogel <lesv@google.com>
Date: Fri, 17 Feb 2017 15:20:06 -0800
Subject: [PATCH 3/3] Add Java8-master to allowed builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. add java8-master
2. turn SUDO on, should give us much large VM’s.
---
 .travis.yml | 3 +++
 travis.sh   | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bdf2e33a92e..3cea8e9d2a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+sudo: true
 language: java
 jdk:
 - oraclejdk8
@@ -55,3 +56,5 @@ after_success:
 branches:
   only:
   - master
+  - java8-master
+
diff --git a/travis.sh b/travis.sh
index ee776fa8791..4d9af1a8ce7 100755
--- a/travis.sh
+++ b/travis.sh
@@ -19,8 +19,6 @@ set -x
 set -o pipefail
 shopt -s globstar
 
-# Give Maven a bit more memory
-export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g'
 
 SKIP_TESTS=false
 if [ -z "$GOOGLE_APPLICATION_CREDENTIALS" ] ; then
@@ -67,8 +65,9 @@ common_travis_dir="$(travis_changed_files_parent)"
 
 [ -z "$common_travis_dir" ] || pushd "$common_travis_dir"
 
-./mvnw  --batch-mode clean verify -e -DskipTests=$SKIP_TESTS
-# LV3-temp remove | egrep -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
+# Give Maven a bit more memory
+export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g -Xms512m'
+./mvnw  --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | egrep -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
 
 [ -z "$common_travis_dir" ] || popd