From ca4b8c9ea7b858176ef5c1db95a3f2ad15cfdaba Mon Sep 17 00:00:00 2001
From: John Tims <john.k.tims@gmail.com>
Date: Sat, 23 Nov 2019 08:32:28 -0700
Subject: [PATCH 1/4] Remove mvnw

---
 .travis.yml      | 4 ----
 mvnvm.properties | 1 -
 2 files changed, 5 deletions(-)
 delete mode 100644 mvnvm.properties

diff --git a/.travis.yml b/.travis.yml
index 1b028e7ce..74e98f3d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,6 @@ env:
     - MODULE=querydsl-scala PROFILES=all,travis
 install: /bin/true
 before_script:
-  # Install mvnvm
-  - mkdir -p ~/.local/bin
-  - curl 'https://bitbucket.org/mjensen/mvnvm/raw/master/mvn' > ~/.local/bin/mvn
-  - chmod +x ~/.local/bin/mvn
   - docker-compose --file travis/docker-compose.yml up --detach mysql postgresql mongo
 
 script:
diff --git a/mvnvm.properties b/mvnvm.properties
deleted file mode 100644
index 0da42eacf..000000000
--- a/mvnvm.properties
+++ /dev/null
@@ -1 +0,0 @@
-mvn_version=3.5.2

From 0e53f6d2883cbddb6116dde9dac79f3a75849346 Mon Sep 17 00:00:00 2001
From: John Tims <john.k.tims@gmail.com>
Date: Sat, 23 Nov 2019 08:33:43 -0700
Subject: [PATCH 2/4] Run tests with verify

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 74e98f3d2..6380fb42a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,11 @@ env:
     - MODULE=!querydsl-scala PROFILES=all,travis,examples
     - MODULE=!querydsl-jpa-codegen PROFILES=jpa,hibernate5,travis,examples
     - MODULE=querydsl-scala PROFILES=all,travis
-install: /bin/true
 before_script:
   - docker-compose --file travis/docker-compose.yml up --detach mysql postgresql mongo
 
 script:
-  - mvn --batch-mode test --activate-profiles ${PROFILES} --projects ${MODULE} -am jacoco:report
+  - mvn --batch-mode verify --activate-profiles ${PROFILES} --projects ${MODULE} -am jacoco:report
 after_success:
   - mvn coveralls:report
 cache:

From 6343e108c35a8742b30c4fe15813ad7632d5aa78 Mon Sep 17 00:00:00 2001
From: John Tims <john.k.tims@gmail.com>
Date: Sat, 23 Nov 2019 10:25:20 -0700
Subject: [PATCH 3/4] Install modules separately

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

diff --git a/.travis.yml b/.travis.yml
index 6380fb42a..2e820f2eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,19 @@ env:
   matrix:
     - MODULE=!querydsl-scala PROFILES=all,travis,examples
     - MODULE=!querydsl-jpa-codegen PROFILES=jpa,hibernate5,travis,examples
-    - MODULE=querydsl-scala PROFILES=all,travis
+    - MODULE=querydsl-scala PROFILES=all,travis EXTRA_ARGS="--resume-from querydsl-scala"
+
+install: mvn clean install -DskipTests
 before_script:
   - docker-compose --file travis/docker-compose.yml up --detach mysql postgresql mongo
 
 script:
-  - mvn --batch-mode verify --activate-profiles ${PROFILES} --projects ${MODULE} -am jacoco:report
+  - mvn --batch-mode verify --activate-profiles ${PROFILES} --projects ${MODULE} -am jacoco:report ${EXTRA_ARGS}
 after_success:
   - mvn coveralls:report
+
+before_cache:
+  - rm -rf $HOME/.m2/repository/com/querydsl/
 cache:
   directories:
     - $HOME/.m2

From 34177e67f4e055a6b8ccd8f16d27ca33c2fc765c Mon Sep 17 00:00:00 2001
From: John Tims <john.k.tims@gmail.com>
Date: Sat, 23 Nov 2019 10:31:56 -0700
Subject: [PATCH 4/4] Run scala by itself

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

diff --git a/.travis.yml b/.travis.yml
index 2e820f2eb..d9f9e9bbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,16 +6,16 @@ services:
   - docker
 env:
   matrix:
-    - MODULE=!querydsl-scala PROFILES=all,travis,examples
-    - MODULE=!querydsl-jpa-codegen PROFILES=jpa,hibernate5,travis,examples
-    - MODULE=querydsl-scala PROFILES=all,travis EXTRA_ARGS="--resume-from querydsl-scala"
+    - ARGS='--activate-profiles all,travis,examples --projects !querydsl-scala'
+    - ARGS='--activate-profiles jpa,hibernate5,travis,examples --projects !querydsl-jpa-codegen'
+    - ARGS='--activate-profiles all,travis --projects querydsl-scala --resume-from querydsl-scala'
 
 install: mvn clean install -DskipTests
 before_script:
   - docker-compose --file travis/docker-compose.yml up --detach mysql postgresql mongo
 
 script:
-  - mvn --batch-mode verify --activate-profiles ${PROFILES} --projects ${MODULE} -am jacoco:report ${EXTRA_ARGS}
+  - mvn --batch-mode verify -am jacoco:report ${ARGS}
 after_success:
   - mvn coveralls:report