From 39256518eabc14e23bbbe0f8ea44d8044b568532 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 24 Aug 2020 15:46:43 -0400
Subject: [PATCH 01/29] upgrade java11 to latest release

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

diff --git a/.travis.yml b/.travis.yml
index 454145eea8..71bf186a5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ matrix:
     # using `openjdk8` leads to javadoc errors
     jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
-  - name: OpenJDK 11
-    jdk: openjdk11
+  - name: OracleJDK 11
+    jdk: oraclejdk11
 env:
   global:
   - TERM=dumb         # for gradle

From 2148affb859ba45c3edce8130b408c4382ec0ff8 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 24 Aug 2020 16:11:48 -0400
Subject: [PATCH 02/29] use oraclejdk11-ea

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

diff --git a/.travis.yml b/.travis.yml
index 71bf186a5e..6983c19890 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ matrix:
     jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
   - name: OracleJDK 11
-    jdk: oraclejdk11
+    jdk: oraclejdk11-ea
 env:
   global:
   - TERM=dumb         # for gradle

From 6efe9ed85ddea637cdc9fad4f91bce08e63abca2 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 24 Aug 2020 16:30:40 -0400
Subject: [PATCH 03/29] install and use latest jdk11

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

diff --git a/.travis.yml b/.travis.yml
index 6983c19890..aaf48e82fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,14 @@ env:
   - TERM=dumb         # for gradle
 
 install: true
+before_install:
+  - echo $JAVA_HOME
+  - which java
+  - sudo apt-get install -y openjdk-11-jdk
+  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+  - which java
+  - java -version
+  - $JAVA_HOME/bin/java -version
 script:
 - ./gradlew clean build --stacktrace
 

From a7b00c461b9f2746030ac66d075bd66d0fb5bf76 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 24 Aug 2020 16:32:42 -0400
Subject: [PATCH 04/29] upgrade mockito-core

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 991939abbe..9be2f4fd08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,7 +79,7 @@ subprojects {
     JUNIT: 'junit:junit:4.13',
     MAVEN_TESTING_HARNESS: 'org.apache.maven.plugin-testing:maven-plugin-testing-harness:3.3.0',
     MAVEN_VERIFIER: 'org.apache.maven.shared:maven-verifier:1.7.2',
-    MOCKITO_CORE: 'org.mockito:mockito-core:3.4.6',
+    MOCKITO_CORE: 'org.mockito:mockito-core:3.5.5',
     SISU_PLEXUS: 'org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4',
     SLF4J_API: 'org.slf4j:slf4j-api:1.7.30',
     SLF4J_SIMPLE: 'org.slf4j:slf4j-simple:1.7.30',

From 384377422f09c0fae06c462fc2c3ce1450eafdd8 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 24 Aug 2020 16:38:18 -0400
Subject: [PATCH 05/29] remove jdk-ea

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

diff --git a/.travis.yml b/.travis.yml
index aaf48e82fb..70f136b75d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ matrix:
     # using `openjdk8` leads to javadoc errors
     jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
-  - name: OracleJDK 11
-    jdk: oraclejdk11-ea
+#  - name: OracleJDK 11
+#    jdk: oraclejdk11-ea
 env:
   global:
   - TERM=dumb         # for gradle

From d6f7f5abf7adfd42fd30e1a8aa9ab36598622863 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 24 Aug 2020 17:04:49 -0400
Subject: [PATCH 06/29] only test for 11

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70f136b75d..ed8b6a93c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ git:
 language: java
 matrix:
   include:
-  - name: Oracle JDK 8 on Trusty
-    # using `openjdk8` leads to javadoc errors
-    jdk: oraclejdk8
+#  - name: Oracle JDK 8 on Trusty
+#    # using `openjdk8` leads to javadoc errors
+#    jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
 #  - name: OracleJDK 11
 #    jdk: oraclejdk11-ea

From fec1b0d08708ca59bd80257fb514ecb940dfd106 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 24 Aug 2020 17:21:49 -0400
Subject: [PATCH 07/29] list contents in jvm directory

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

diff --git a/.travis.yml b/.travis.yml
index ed8b6a93c4..23eb44ecfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ install: true
 before_install:
   - echo $JAVA_HOME
   - which java
+  - ls /usr/local/lib/jvm/
   - sudo apt-get install -y openjdk-11-jdk
   - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
   - which java

From cd5abe0dd7bf3724893b6b7d997b3703dca07d65 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 09:48:25 -0400
Subject: [PATCH 08/29] enabling multiple jdks

---
 .travis.yml | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 23eb44ecfb..3185200d77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,26 +4,32 @@ git:
 language: java
 matrix:
   include:
-#  - name: Oracle JDK 8 on Trusty
-#    # using `openjdk8` leads to javadoc errors
-#    jdk: oraclejdk8
+  - name: Oracle JDK 8 on Trusty
+    # using `openjdk8` leads to javadoc errors
+    jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
-#  - name: OracleJDK 11
-#    jdk: oraclejdk11-ea
+  - name: OracleJDK 11
+    before_install:
+      - echo $JAVA_HOME
+      - which java
+      - sudo apt-get install -y openjdk-11-jdk
+      - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+      - which java
+      - java -version
+      - $JAVA_HOME/bin/java -version
 env:
   global:
   - TERM=dumb         # for gradle
 
 install: true
-before_install:
-  - echo $JAVA_HOME
-  - which java
-  - ls /usr/local/lib/jvm/
-  - sudo apt-get install -y openjdk-11-jdk
-  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
-  - which java
-  - java -version
-  - $JAVA_HOME/bin/java -version
+#before_install:
+#  - echo $JAVA_HOME
+#  - which java
+#  - sudo apt-get install -y openjdk-11-jdk
+#  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+#  - which java
+#  - java -version
+#  - $JAVA_HOME/bin/java -version
 script:
 - ./gradlew clean build --stacktrace
 

From 203b3878dc93600dbc01827feba13006b8f2f5b5 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 10:01:20 -0400
Subject: [PATCH 09/29] fix install command

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

diff --git a/.travis.yml b/.travis.yml
index 3185200d77..a730d942b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,10 +9,10 @@ matrix:
     jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
   - name: OracleJDK 11
-    before_install:
+    install:
       - echo $JAVA_HOME
       - which java
-      - sudo apt-get install -y openjdk-11-jdk
+      - sudo apt-get install -y openjdk-11-jdk-headless
       - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
       - which java
       - java -version

From fcece64f532234fae39c89231e9e963f5194562b Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 10:10:28 -0400
Subject: [PATCH 10/29] installation fixes

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

diff --git a/.travis.yml b/.travis.yml
index a730d942b8..6bb4520daf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,10 @@ matrix:
     jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
   - name: OracleJDK 11
-    install:
+    before_script:
       - echo $JAVA_HOME
       - which java
+      - sudo add-apt-repository -y ppa:openjdk-r/ppa
       - sudo apt-get install -y openjdk-11-jdk-headless
       - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
       - which java

From f88b16d6e2e7f52cda388500a7f9a618185852b7 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 10:14:54 -0400
Subject: [PATCH 11/29] installation fixes

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

diff --git a/.travis.yml b/.travis.yml
index 6bb4520daf..52193a3138 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ matrix:
       - echo $JAVA_HOME
       - which java
       - sudo add-apt-repository -y ppa:openjdk-r/ppa
+      - sudo apt-get update
       - sudo apt-get install -y openjdk-11-jdk-headless
       - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
       - which java

From ef0607a8db99adabd6de082b753b8e75a5216c99 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 10:21:39 -0400
Subject: [PATCH 12/29] remove old version of java

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

diff --git a/.travis.yml b/.travis.yml
index 52193a3138..0fdb66c0cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ matrix:
     before_script:
       - echo $JAVA_HOME
       - which java
+      - sudo rm -rf /usr/local/lib/jvm/
       - sudo add-apt-repository -y ppa:openjdk-r/ppa
       - sudo apt-get update
       - sudo apt-get install -y openjdk-11-jdk-headless

From f46536f121b9a56d1cf657cc95e69f48b39c2492 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 10:33:37 -0400
Subject: [PATCH 13/29] install fix

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

diff --git a/.travis.yml b/.travis.yml
index 0fdb66c0cf..ddb3f7a50f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ matrix:
     # using `openjdk8` leads to javadoc errors
     jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
-  - name: OracleJDK 11
-    before_script:
+  - name: OpenJDK 11
+    before_install:
       - echo $JAVA_HOME
       - which java
       - sudo rm -rf /usr/local/lib/jvm/

From 5423011d223039e367ded034e7c11ce8ff5f2a45 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 10:47:17 -0400
Subject: [PATCH 14/29] comment out java -version

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

diff --git a/.travis.yml b/.travis.yml
index ddb3f7a50f..30eb1599d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ matrix:
       - sudo apt-get install -y openjdk-11-jdk-headless
       - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
       - which java
-      - java -version
+#      - java -version
       - $JAVA_HOME/bin/java -version
 env:
   global:

From f415a12b0136f9b38ff1f51ae6d9619c8b50f5b4 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 10:57:40 -0400
Subject: [PATCH 15/29] remove language field

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

diff --git a/.travis.yml b/.travis.yml
index 30eb1599d3..8a962d6baf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 git:
   depth: 3
-language: java
+#language: java
 matrix:
   include:
   - name: Oracle JDK 8 on Trusty
@@ -9,7 +9,7 @@ matrix:
     jdk: oraclejdk8
     dist: trusty # oraclejdk8 absent in Xenial
   - name: OpenJDK 11
-    before_install:
+    install:
       - echo $JAVA_HOME
       - which java
       - sudo rm -rf /usr/local/lib/jvm/

From 7cb0b9539b0e87f8594840a9cdc9461fa386851a Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 11:10:07 -0400
Subject: [PATCH 16/29] don't include jdk8

---
 .travis.yml | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a962d6baf..c5b876b92c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,37 +2,30 @@ sudo: false
 git:
   depth: 3
 #language: java
-matrix:
-  include:
-  - name: Oracle JDK 8 on Trusty
-    # using `openjdk8` leads to javadoc errors
-    jdk: oraclejdk8
-    dist: trusty # oraclejdk8 absent in Xenial
-  - name: OpenJDK 11
-    install:
-      - echo $JAVA_HOME
-      - which java
-      - sudo rm -rf /usr/local/lib/jvm/
-      - sudo add-apt-repository -y ppa:openjdk-r/ppa
-      - sudo apt-get update
-      - sudo apt-get install -y openjdk-11-jdk-headless
-      - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
-      - which java
-#      - java -version
-      - $JAVA_HOME/bin/java -version
+#matrix:
+#  include:
+#  - name: Oracle JDK 8 on Trusty
+#    # using `openjdk8` leads to javadoc errors
+#    jdk: oraclejdk8
+#    dist: trusty # oraclejdk8 absent in Xenial
+#  - name: OpenJDK 11
+
 env:
   global:
   - TERM=dumb         # for gradle
 
 install: true
-#before_install:
-#  - echo $JAVA_HOME
-#  - which java
-#  - sudo apt-get install -y openjdk-11-jdk
-#  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
-#  - which java
-#  - java -version
-#  - $JAVA_HOME/bin/java -version
+before_install:
+  - echo $JAVA_HOME
+  - which java
+  - sudo rm -rf /usr/local/lib/jvm/
+  - sudo add-apt-repository -y ppa:openjdk-r/ppa
+  - sudo apt-get update
+  - sudo apt-get install -y openjdk-11-jdk-headless
+  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+  - which java
+  - java -version
+  - $JAVA_HOME/bin/java -version
 script:
 - ./gradlew clean build --stacktrace
 

From f6b75cd9671c6fa64dcfbe59a7c1f9b28da853e2 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 12:04:12 -0400
Subject: [PATCH 17/29] don't include jdk8

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

diff --git a/.travis.yml b/.travis.yml
index c5b876b92c..48f64d3be2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ before_install:
   - java -version
   - $JAVA_HOME/bin/java -version
 script:
+- ./gradlew -v
 - ./gradlew clean build --stacktrace
 
 # cobbled together from

From 2ebbc0c46defa74446926d9245e7e4746dac949e Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 12:51:59 -0400
Subject: [PATCH 18/29] don't use jdk-headless

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

diff --git a/.travis.yml b/.travis.yml
index 48f64d3be2..c38d9d8449 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ before_install:
   - sudo rm -rf /usr/local/lib/jvm/
   - sudo add-apt-repository -y ppa:openjdk-r/ppa
   - sudo apt-get update
-  - sudo apt-get install -y openjdk-11-jdk-headless
+  - sudo apt-get install -y openjdk-11-jdk
   - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
   - which java
   - java -version

From 4e56083a6e6ef046b1ae740642aa4d7b4e636302 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 12:57:41 -0400
Subject: [PATCH 19/29] list available jdks

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

diff --git a/.travis.yml b/.travis.yml
index c38d9d8449..171d655d87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,7 @@ before_install:
   - sudo apt-get install -y openjdk-11-jdk
   - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
   - which java
+  - sudo update-java-alternatives --list
   - java -version
   - $JAVA_HOME/bin/java -version
 script:

From 3ba68650752cf1ddf5982d25aaacbd679525fc89 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 13:04:16 -0400
Subject: [PATCH 20/29] upgrading jdk11 from 11.0.5 to latest

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

diff --git a/.travis.yml b/.travis.yml
index 171d655d87..c5a63d1e5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,11 +20,10 @@ before_install:
   - which java
   - sudo rm -rf /usr/local/lib/jvm/
   - sudo add-apt-repository -y ppa:openjdk-r/ppa
-  - sudo apt-get update
-  - sudo apt-get install -y openjdk-11-jdk
+  - sudo apt update
+  - sudo apt install -y openjdk-11-jdk
   - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
   - which java
-  - sudo update-java-alternatives --list
   - java -version
   - $JAVA_HOME/bin/java -version
 script:

From 75458f309b5cfa1edd64bc712048b03c3d1cf68f Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 15:23:09 -0400
Subject: [PATCH 21/29] use oracle java 11

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

diff --git a/.travis.yml b/.travis.yml
index c5a63d1e5e..b57c2afc4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,12 @@ before_install:
   - echo $JAVA_HOME
   - which java
   - sudo rm -rf /usr/local/lib/jvm/
-  - sudo add-apt-repository -y ppa:openjdk-r/ppa
+#  - sudo add-apt-repository -y ppa:openjdk-r/ppa
+#  - sudo apt update
+#  - sudo apt install -y openjdk-11-jre-headless
+  - sudo add-apt-repository ppa:linuxuprising/java
   - sudo apt update
-  - sudo apt install -y openjdk-11-jdk
+  - sudo apt install oracle-java11-set-default
   - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
   - which java
   - java -version

From ea9083d7f81ed14ba9e7013c457afe8c61fa9b9a Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 15:41:43 -0400
Subject: [PATCH 22/29] update apt-get

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

diff --git a/.travis.yml b/.travis.yml
index b57c2afc4e..12ae596c22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,13 +19,11 @@ before_install:
   - echo $JAVA_HOME
   - which java
   - sudo rm -rf /usr/local/lib/jvm/
-#  - sudo add-apt-repository -y ppa:openjdk-r/ppa
-#  - sudo apt update
-#  - sudo apt install -y openjdk-11-jre-headless
-  - sudo add-apt-repository ppa:linuxuprising/java
-  - sudo apt update
-  - sudo apt install oracle-java11-set-default
+  - sudo add-apt-repository -y ppa:openjdk-r/ppa
+  - sudo apt-get update
+  - sudo apt install -y openjdk-11-jdk
   - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+  - export PATH=$JAVA_HOME/bin:$PATH
   - which java
   - java -version
   - $JAVA_HOME/bin/java -version

From 489d9f7ce24cce7f4859c9bb0cc1164dabeb97a6 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Tue, 25 Aug 2020 16:17:31 -0400
Subject: [PATCH 23/29] using curl

---
 .travis.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 12ae596c22..35b6d4664b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,18 @@ install: true
 before_install:
   - echo $JAVA_HOME
   - which java
-  - sudo rm -rf /usr/local/lib/jvm/
-  - sudo add-apt-repository -y ppa:openjdk-r/ppa
-  - sudo apt-get update
-  - sudo apt install -y openjdk-11-jdk
-  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
-  - export PATH=$JAVA_HOME/bin:$PATH
+#  - sudo rm -rf /usr/local/lib/jvm/
+#  - sudo add-apt-repository -y ppa:openjdk-r/ppa
+#  - sudo apt-get update
+#  - sudo apt-get upgrade
+#  - sudo apt install -y openjdk-11-jdk
+#  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+#  - export PATH=$JAVA_HOME/bin:$PATH
+  - curl -O https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.7_linux-x64_bin.tar.gz
+  - tar zxvf openjdk-11.0.7_linux-x64_bin.tar.gz
+  - sudo mv jdk-11* /usr/local/
+  - export JAVA_HOME=/usr/local/jdk-11.0.7
+  - export PATH=$PATH:$JAVA_HOME/bin
   - which java
   - java -version
   - $JAVA_HOME/bin/java -version

From 54d6e9cd59ddfe5ab8c95bf7b66f0e2d1a09f284 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 26 Aug 2020 09:19:31 -0400
Subject: [PATCH 24/29] use adoptopenjdk

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35b6d4664b..05bafdab16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,18 +18,19 @@ install: true
 before_install:
   - echo $JAVA_HOME
   - which java
+  - cd ~
 #  - sudo rm -rf /usr/local/lib/jvm/
 #  - sudo add-apt-repository -y ppa:openjdk-r/ppa
 #  - sudo apt-get update
 #  - sudo apt-get upgrade
 #  - sudo apt install -y openjdk-11-jdk
+  - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+  - sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+  - apt-get update
+  - apt-get install adoptopenjdk-11-hotspot
 #  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
-#  - export PATH=$JAVA_HOME/bin:$PATH
-  - curl -O https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.7_linux-x64_bin.tar.gz
-  - tar zxvf openjdk-11.0.7_linux-x64_bin.tar.gz
-  - sudo mv jdk-11* /usr/local/
-  - export JAVA_HOME=/usr/local/jdk-11.0.7
-  - export PATH=$PATH:$JAVA_HOME/bin
+  - export JAVA_HOME=/usr/libexec/java_home -v 11
+  - export PATH=$JAVA_HOME/bin:$PATH
   - which java
   - java -version
   - $JAVA_HOME/bin/java -version

From c2379c9e94677dd5235c2241df91b3989ee7c1cb Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 26 Aug 2020 09:21:41 -0400
Subject: [PATCH 25/29] add sudo

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

diff --git a/.travis.yml b/.travis.yml
index 05bafdab16..250611d0eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@ before_install:
 #  - sudo apt install -y openjdk-11-jdk
   - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
   - sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
-  - apt-get update
-  - apt-get install adoptopenjdk-11-hotspot
+  - sudo apt-get update
+  - sudo apt-get install adoptopenjdk-11-hotspot
 #  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
   - export JAVA_HOME=/usr/libexec/java_home -v 11
   - export PATH=$JAVA_HOME/bin:$PATH

From 31a41e6f23410f806e93dba71e2a58e84a6fc217 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 26 Aug 2020 09:25:30 -0400
Subject: [PATCH 26/29] modify export JAVA_HOME

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

diff --git a/.travis.yml b/.travis.yml
index 250611d0eb..50418e371c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ before_install:
   - sudo apt-get update
   - sudo apt-get install adoptopenjdk-11-hotspot
 #  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
-  - export JAVA_HOME=/usr/libexec/java_home -v 11
+  - export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/
   - export PATH=$JAVA_HOME/bin:$PATH
   - which java
   - java -version

From cae72bf314dce708251dcfcd5c4a2d6afb4cae6e Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 26 Aug 2020 09:30:29 -0400
Subject: [PATCH 27/29] remove commented out code

---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 50418e371c..7c989ed28d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,17 +18,10 @@ install: true
 before_install:
   - echo $JAVA_HOME
   - which java
-  - cd ~
-#  - sudo rm -rf /usr/local/lib/jvm/
-#  - sudo add-apt-repository -y ppa:openjdk-r/ppa
-#  - sudo apt-get update
-#  - sudo apt-get upgrade
-#  - sudo apt install -y openjdk-11-jdk
   - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
   - sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
   - sudo apt-get update
   - sudo apt-get install adoptopenjdk-11-hotspot
-#  - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
   - export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/
   - export PATH=$JAVA_HOME/bin:$PATH
   - which java

From fd0971d36aa744979ce2f9a4d687d7dd54b90a2a Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 26 Aug 2020 09:36:06 -0400
Subject: [PATCH 28/29] update mockito to 3.5.7

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9be2f4fd08..e172a9d91a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,7 +79,7 @@ subprojects {
     JUNIT: 'junit:junit:4.13',
     MAVEN_TESTING_HARNESS: 'org.apache.maven.plugin-testing:maven-plugin-testing-harness:3.3.0',
     MAVEN_VERIFIER: 'org.apache.maven.shared:maven-verifier:1.7.2',
-    MOCKITO_CORE: 'org.mockito:mockito-core:3.5.5',
+    MOCKITO_CORE: 'org.mockito:mockito-core:3.5.7',
     SISU_PLEXUS: 'org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4',
     SLF4J_API: 'org.slf4j:slf4j-api:1.7.30',
     SLF4J_SIMPLE: 'org.slf4j:slf4j-simple:1.7.30',

From 10fe6e4de405449ed376b2ba4ecde2977ee8b0f4 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 26 Aug 2020 09:46:23 -0400
Subject: [PATCH 29/29] use both jdk8 and jdk 11

---
 .travis.yml | 53 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7c989ed28d..8a1ea4f73f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,45 @@
 sudo: false
 git:
   depth: 3
-#language: java
-#matrix:
-#  include:
-#  - name: Oracle JDK 8 on Trusty
-#    # using `openjdk8` leads to javadoc errors
-#    jdk: oraclejdk8
-#    dist: trusty # oraclejdk8 absent in Xenial
-#  - name: OpenJDK 11
+language: java
+matrix:
+  include:
+  - name: Oracle JDK 8 on Trusty
+    # using `openjdk8` leads to javadoc errors
+    jdk: oraclejdk8
+    dist: trusty # oraclejdk8 absent in Xenial
+  - name: AdoptOpenJDK 11
+    before_install:
+      - echo $JAVA_HOME
+      - which java
+      - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+      - sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+      - sudo apt-get update
+      - sudo apt-get install adoptopenjdk-11-hotspot
+      - export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/
+      - export PATH=$JAVA_HOME/bin:$PATH
+      - which java
+      - java -version
+      - $JAVA_HOME/bin/java -version
+
 
 env:
   global:
   - TERM=dumb         # for gradle
 
 install: true
-before_install:
-  - echo $JAVA_HOME
-  - which java
-  - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
-  - sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
-  - sudo apt-get update
-  - sudo apt-get install adoptopenjdk-11-hotspot
-  - export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/
-  - export PATH=$JAVA_HOME/bin:$PATH
-  - which java
-  - java -version
-  - $JAVA_HOME/bin/java -version
+#before_install:
+#  - echo $JAVA_HOME
+#  - which java
+#  - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo apt-key add -
+#  - sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/
+#  - sudo apt-get update
+#  - sudo apt-get install adoptopenjdk-11-hotspot
+#  - export JAVA_HOME=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/
+#  - export PATH=$JAVA_HOME/bin:$PATH
+#  - which java
+#  - java -version
+#  - $JAVA_HOME/bin/java -version
 script:
 - ./gradlew -v
 - ./gradlew clean build --stacktrace