diff --git a/build.gradle b/build.gradle
index 00224f2a6..a70cc1f48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ buildscript {
 plugins {
   // Java static analysis plugins. Keep versions consistent with
   // ./buildSrc/build.gradle
-  id 'nebula.lint' version '10.4.2'
+  id 'nebula.lint' version '16.0.2'
   // TODO(weiminyu): consider remove net.ltgt.apt. Gradle 5.2+
   //  has similar functionalities.
   id 'net.ltgt.apt' version '0.19' apply false
@@ -46,7 +46,7 @@ plugins {
   id "com.moowork.node" version "1.2.0"
 
   id 'idea'
-  id 'com.diffplug.gradle.spotless' version '3.18.0'
+  id 'com.diffplug.gradle.spotless' version '3.25.0'
 
   id 'jacoco'
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 162f880b1..14d785ba8 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -23,13 +23,13 @@ buildscript {
 
 plugins {
   // Java static analysis plugins. Keep versions consistent with ../build.gradle
-  id 'nebula.lint' version '10.4.2'
+  id 'nebula.lint' version '16.0.2'
   // Config helper for annotation processors such as AutoValue and Dagger.
   // Ensures that source code is generated at an appropriate location.
   id 'net.ltgt.apt' version '0.19' apply false
   id 'net.ltgt.errorprone' version '0.6.1'
   id 'checkstyle'
-  id 'com.diffplug.gradle.spotless' version '3.18.0'
+  id 'com.diffplug.gradle.spotless' version '3.25.0'
 }
 
 if (rootProject.enableDependencyLocking.toBoolean()) {
diff --git a/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile b/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
index 06943c1ac..4ba4301e9 100644
--- a/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
+++ b/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
@@ -1,60 +1,44 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-cglib:cglib-nodep:3.2.2
 com.diffplug.durian:durian-collect:1.2.0
 com.diffplug.durian:durian-core:1.2.0
 com.diffplug.durian:durian-io:1.2.0
-com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:3.18.0
-com.diffplug.spotless:spotless-lib-extra:1.18.0
-com.diffplug.spotless:spotless-lib:1.18.0
-com.diffplug.spotless:spotless-plugin-gradle:3.18.0
+com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:3.25.0
+com.diffplug.spotless:spotless-lib-extra:1.25.0
+com.diffplug.spotless:spotless-lib:1.25.0
+com.diffplug.spotless:spotless-plugin-gradle:3.25.0
 com.google.guava:guava:19.0
 com.googlecode.concurrent-trees:concurrent-trees:2.6.1
 com.googlecode.javaewah:JavaEWAH:1.1.6
-com.jcraft:jsch:0.1.54
+com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.1
-com.netflix.nebula:gradle-lint-plugin:10.4.2
+com.netflix.nebula:gradle-lint-plugin:16.0.2
 com.netflix.nebula:nebula-gradle-interop:1.0.11
-com.netflix.nebula:nebula-test:7.4.0
-commons-codec:commons-codec:1.9
-commons-io:commons-io:2.5
 commons-lang:commons-lang:2.6
-commons-logging:commons-logging:1.2
 javax.inject:javax.inject:1
 junit:junit:4.12
-log4j:log4j:1.2.14
-nebula.lint:nebula.lint.gradle.plugin:10.4.2
+nebula.lint:nebula.lint.gradle.plugin:16.0.2
 net.ltgt.apt:net.ltgt.apt.gradle.plugin:0.19
 net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:0.6.1
 net.ltgt.gradle:gradle-apt-plugin:0.19
 net.ltgt.gradle:gradle-errorprone-plugin:0.6.1
-org.apache.ant:ant-antlr:1.8.4
-org.apache.ant:ant-junit:1.8.4
-org.apache.ant:ant-launcher:1.8.4
-org.apache.ant:ant:1.8.4
 org.apache.commons:commons-lang3:3.8.1
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.4
 org.apache.maven:maven-artifact:3.6.2
 org.apache.maven:maven-builder-support:3.6.2
 org.apache.maven:maven-model-builder:3.6.2
 org.apache.maven:maven-model:3.6.2
+org.bouncycastle:bcpg-jdk15on:1.61
+org.bouncycastle:bcpkix-jdk15on:1.61
+org.bouncycastle:bcprov-jdk15on:1.61
 org.codehaus.gpars:gpars:1.2.1
-org.codehaus.groovy:groovy-all:2.4.15
-org.codehaus.groovy:groovy-ant:2.1.8
-org.codehaus.groovy:groovy-groovydoc:2.1.8
-org.codehaus.groovy:groovy-templates:2.1.8
 org.codehaus.groovy:groovy-xml:2.4.7
 org.codehaus.groovy:groovy:2.4.7
 org.codehaus.jsr166-mirror:jsr166y:1.7.0
 org.codehaus.plexus:plexus-interpolation:1.25
 org.codehaus.plexus:plexus-utils:3.2.1
-org.codenarc:CodeNarc:0.25.2
-org.eclipse.jdt:core:3.1.1
-org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
+org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.3
-org.gmetrics:GMetrics:0.7
 org.hamcrest:hamcrest-core:1.3
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
@@ -62,7 +46,8 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains:annotations:13.0
 org.multiverse:multiverse-core:0.7.0
-org.objenesis:objenesis:2.4
-org.ow2.asm:asm:7.0
+org.ow2.asm:asm-analysis:7.1
+org.ow2.asm:asm-commons:7.1
+org.ow2.asm:asm-tree:7.1
+org.ow2.asm:asm:7.1
 org.slf4j:slf4j-api:1.7.2
-org.spockframework:spock-core:1.3-groovy-2.4
diff --git a/buildSrc/gradle/dependency-locks/checkstyle.lockfile b/buildSrc/gradle/dependency-locks/checkstyle.lockfile
index 11100d936..986396b59 100644
--- a/buildSrc/gradle/dependency-locks/checkstyle.lockfile
+++ b/buildSrc/gradle/dependency-locks/checkstyle.lockfile
@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:28.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.17
-commons-beanutils:commons-beanutils:1.9.3
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.24
+commons-beanutils:commons-beanutils:1.9.4
 commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.0
-net.sf.saxon:Saxon-HE:9.9.0-2
+info.picocli:picocli:4.0.3
+net.sf.saxon:Saxon-HE:9.9.1-4
 org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/buildSrc/gradle/dependency-locks/jacocoAgent.lockfile b/buildSrc/gradle/dependency-locks/jacocoAgent.lockfile
index e22f361cf..6b7fa31b5 100644
--- a/buildSrc/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/buildSrc/gradle/dependency-locks/jacocoAgent.lockfile
@@ -1,4 +1,4 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
+org.jacoco:org.jacoco.agent:0.8.5
diff --git a/buildSrc/gradle/dependency-locks/jacocoAnt.lockfile b/buildSrc/gradle/dependency-locks/jacocoAnt.lockfile
index 9a2c3a029..40e2c298b 100644
--- a/buildSrc/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/buildSrc/gradle/dependency-locks/jacocoAnt.lockfile
@@ -1,11 +1,11 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
-org.jacoco:org.jacoco.ant:0.8.4
-org.jacoco:org.jacoco.core:0.8.4
-org.jacoco:org.jacoco.report:0.8.4
-org.ow2.asm:asm-analysis:7.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:7.1
-org.ow2.asm:asm:7.1
+org.jacoco:org.jacoco.agent:0.8.5
+org.jacoco:org.jacoco.ant:0.8.5
+org.jacoco:org.jacoco.core:0.8.5
+org.jacoco:org.jacoco.report:0.8.5
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm:7.2
diff --git a/buildSrc/gradle/dependency-locks/runtime.lockfile b/buildSrc/gradle/dependency-locks/runtime.lockfile
new file mode 100644
index 000000000..af10edfea
--- /dev/null
+++ b/buildSrc/gradle/dependency-locks/runtime.lockfile
@@ -0,0 +1,61 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.9.9
+com.google.api-client:google-api-client:1.27.0
+com.google.api.grpc:proto-google-common-protos:1.12.0
+com.google.api.grpc:proto-google-iam-v1:0.12.0
+com.google.api:api-common:1.7.0
+com.google.api:gax-httpjson:0.52.1
+com.google.api:gax:1.35.1
+com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
+com.google.auth:google-auth-library-credentials:0.16.1
+com.google.auth:google-auth-library-oauth2-http:0.16.1
+com.google.auto.value:auto-value-annotations:1.6.3
+com.google.cloud:google-cloud-core-http:1.59.0
+com.google.cloud:google-cloud-core:1.59.0
+com.google.cloud:google-cloud-storage:1.59.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.7
+com.google.common.html.types:types:1.0.4
+com.google.errorprone:error_prone_annotations:2.3.2
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:28.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.gwt:gwt-user:2.8.0-beta1
+com.google.http-client:google-http-client-appengine:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
+com.google.http-client:google-http-client:1.30.1
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.oauth-client:google-oauth-client:1.27.0
+com.google.protobuf:protobuf-java-util:3.6.1
+com.google.protobuf:protobuf-java:3.6.1
+com.google.template:soy:2018-03-14
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.19.0
+io.opencensus:opencensus-api:0.21.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
+javax.annotation:javax.annotation-api:1.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+javax.validation:validation-api:1.0.0.GA
+joda-time:joda-time:2.9.2
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.8
+org.apache.httpcomponents:httpcore:4.4.11
+org.checkerframework:checker-qual:2.8.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.json:json:20160212
+org.ow2.asm:asm-analysis:6.0
+org.ow2.asm:asm-commons:6.0
+org.ow2.asm:asm-tree:6.0
+org.ow2.asm:asm-util:6.0
+org.ow2.asm:asm:6.0
+org.threeten:threetenbp:1.3.3
diff --git a/buildSrc/gradle/dependency-locks/testRuntime.lockfile b/buildSrc/gradle/dependency-locks/testRuntime.lockfile
new file mode 100644
index 000000000..d40f959a1
--- /dev/null
+++ b/buildSrc/gradle/dependency-locks/testRuntime.lockfile
@@ -0,0 +1,71 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+aopalliance:aopalliance:1.0
+args4j:args4j:2.0.23
+com.fasterxml.jackson.core:jackson-core:2.9.9
+com.google.api-client:google-api-client:1.27.0
+com.google.api.grpc:proto-google-common-protos:1.12.0
+com.google.api.grpc:proto-google-iam-v1:0.12.0
+com.google.api:api-common:1.7.0
+com.google.api:gax-httpjson:0.52.1
+com.google.api:gax:1.35.1
+com.google.apis:google-api-services-storage:v1-rev20181013-1.27.0
+com.google.auth:google-auth-library-credentials:0.16.1
+com.google.auth:google-auth-library-oauth2-http:0.16.1
+com.google.auto.value:auto-value-annotations:1.6.3
+com.google.cloud:google-cloud-core-http:1.59.0
+com.google.cloud:google-cloud-core:1.59.0
+com.google.cloud:google-cloud-storage:1.59.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.code.gson:gson:2.7
+com.google.common.html.types:types:1.0.4
+com.google.errorprone:error_prone_annotations:2.3.2
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:28.1-jre
+com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
+com.google.gwt:gwt-user:2.8.0-beta1
+com.google.http-client:google-http-client-appengine:1.27.0
+com.google.http-client:google-http-client-jackson2:1.30.1
+com.google.http-client:google-http-client:1.30.1
+com.google.inject.extensions:guice-multibindings:4.1.0
+com.google.inject:guice:4.1.0
+com.google.j2objc:j2objc-annotations:1.3
+com.google.oauth-client:google-oauth-client:1.27.0
+com.google.protobuf:protobuf-java-util:3.6.1
+com.google.protobuf:protobuf-java:3.6.1
+com.google.template:soy:2018-03-14
+com.google.truth.extensions:truth-java8-extension:1.0
+com.google.truth:truth:1.0
+com.googlecode.java-diff-utils:diffutils:1.3.0
+com.ibm.icu:icu4j:57.1
+commons-codec:commons-codec:1.11
+commons-logging:commons-logging:1.2
+io.grpc:grpc-context:1.19.0
+io.opencensus:opencensus-api:0.21.0
+io.opencensus:opencensus-contrib-http-util:0.21.0
+javax.annotation:javax.annotation-api:1.2
+javax.annotation:jsr250-api:1.0
+javax.inject:javax.inject:1
+javax.validation:validation-api:1.0.0.GA
+joda-time:joda-time:2.9.2
+junit:junit:4.12
+net.bytebuddy:byte-buddy-agent:1.9.7
+net.bytebuddy:byte-buddy:1.9.7
+org.apache.commons:commons-lang3:3.8.1
+org.apache.commons:commons-text:1.6
+org.apache.httpcomponents:httpclient:4.5.8
+org.apache.httpcomponents:httpcore:4.4.11
+org.checkerframework:checker-compat-qual:2.5.5
+org.checkerframework:checker-qual:2.8.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
+org.hamcrest:hamcrest-core:1.3
+org.json:json:20160212
+org.mockito:mockito-core:2.25.0
+org.objenesis:objenesis:2.6
+org.ow2.asm:asm-analysis:6.0
+org.ow2.asm:asm-commons:6.0
+org.ow2.asm:asm-tree:6.0
+org.ow2.asm:asm-util:6.0
+org.ow2.asm:asm:6.0
+org.threeten:threetenbp:1.3.3
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 0e8a824b5..e2885d996 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -73,6 +73,19 @@ by Joshua Bloch in his book Effective Java -->
     <property name="message" value="MockitoJUnitRunner is deprecated. Use @RunWith(JUnit4.class) and MockitoRule instead."/>
   </module>
 
+  <module name="LineLength">
+    <!-- Checks if a line is too long. -->
+    <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
+    <property name="severity" value="error"/>
+
+    <!-- Ignore lines that have any series of 80 or more non-whitespace characters.
+    These lines likely cannot be broken.
+    -->
+    <property name="ignorePattern"
+        value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
+        default=".*[^ ]{80,}.*"/>
+  </module>
+
   <!-- All Java AST specific tests live under TreeWalker module. -->
   <module name="TreeWalker">
 
@@ -184,19 +197,6 @@ by Joshua Bloch in his book Effective Java -->
     LENGTH and CODING CHECKS
     -->
 
-    <module name="LineLength">
-      <!-- Checks if a line is too long. -->
-      <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
-      <property name="severity" value="error"/>
-
-      <!-- Ignore lines that have any series of 80 or more non-whitespace characters.
-      These lines likely cannot be broken.
-      -->
-      <property name="ignorePattern"
-          value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
-          default=".*[^ ]{80,}.*"/>
-    </module>
-
     <module name="OperatorWrap">
       <property name="option" value="nl"/>
       <property name="tokens" value="QUESTION, EQUAL, NOT_EQUAL, DIV, PLUS, MINUS, STAR, MOD, SR, BSR, GE, GT, SL, LE, LT, BXOR, BOR, LOR, BAND, LAND, TYPE_EXTENSION_AND, LITERAL_INSTANCEOF"/>
diff --git a/config/dependency-license/allowed_licenses.json b/config/dependency-license/allowed_licenses.json
index d20e88a41..b62171509 100644
--- a/config/dependency-license/allowed_licenses.json
+++ b/config/dependency-license/allowed_licenses.json
@@ -141,6 +141,9 @@
     {
       "moduleLicense": "Eclipse Public License - v 2.0"
     },
+    {
+      "moduleLicense": "Eclipse Public License 2.0"
+    },
     {
       "moduleLicense": "https://www.eclipse.org/legal/epl-2.0/, http://www.gnu.org/copyleft/gpl.html, http://www.gnu.org/licenses/lgpl.html"
     },
diff --git a/core/build.gradle b/core/build.gradle
index 9ba5e85cd..302bd15d4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -160,7 +160,6 @@ dependencies {
   compile deps['com.google.apis:google-api-services-groupssettings']
   compile deps['com.google.apis:google-api-services-monitoring']
   compile deps['com.google.apis:google-api-services-sheets']
-  testCompileOnly deps['com.google.appengine:appengine-api-1.0-sdk']
   testCompile deps['com.google.appengine:appengine-api-stubs']
   compile deps['com.google.appengine.tools:appengine-gcs-client']
   compile deps['com.google.appengine.tools:appengine-mapreduce']
@@ -193,9 +192,11 @@ dependencies {
   testCompile deps['com.thoughtworks.qdox:qdox']
   compile deps['dnsjava:dnsjava']
   testCompile deps['io.github.classgraph:classgraph']
+  testCompile deps['javax.annotation:javax.annotation-api']
   testCompile deps['javax.annotation:jsr250-api']
   compile deps['javax.inject:javax.inject']
   compile deps['javax.mail:mail']
+  compile deps['javax.persistence:javax.persistence-api']
   compile deps['javax.servlet:servlet-api']
   compile deps['javax.xml.bind:jaxb-api']
   compile deps['jline:jline']
@@ -206,6 +207,7 @@ dependencies {
   compile deps['org.apache.beam:beam-sdks-java-core']
   compile deps['org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core']
   compile deps['org.apache.beam:beam-sdks-java-io-google-cloud-platform']
+  testCompile deps['org.apache.commons:commons-lang3']
   testCompile deps['org.apache.commons:commons-text']
   testCompile deps['org.apache.ftpserver:ftplet-api']
   testCompile deps['org.apache.ftpserver:ftpserver-core']
@@ -219,6 +221,7 @@ dependencies {
   testCompile deps['org.bouncycastle:bcpkix-jdk15on']
   compile deps['org.bouncycastle:bcprov-jdk15on']
   runtime deps['org.glassfish.jaxb:jaxb-runtime']
+  compile deps['org.hibernate:hibernate-core']
   compile deps['org.joda:joda-money']
   compile deps['org.json:json']
   testCompile deps['org.mortbay.jetty:jetty']
@@ -227,10 +230,15 @@ dependencies {
   testCompile deps['org.seleniumhq.selenium:selenium-chrome-driver']
   testCompile deps['org.seleniumhq.selenium:selenium-java']
   testCompile deps['org.seleniumhq.selenium:selenium-remote-driver']
+  testCompile deps['org.testcontainers:jdbc']
   compile deps['org.testcontainers:postgresql']
   testCompile deps['org.testcontainers:selenium']
+  testCompile deps['org.testcontainers:testcontainers']
   compile deps['xerces:xmlParserAPIs']
   compile deps['xpp3:xpp3']
+  // This dependency must come after javax.mail:mail as it would otherwise
+  // shadow classes in package javax.mail with its own implementation.
+  compile deps['com.google.appengine:appengine-api-1.0-sdk']
 
   // Known issue: nebula-lint misses inherited dependency.
   compile project(':third_party')
diff --git a/core/gradle/dependency-locks/checkstyle.lockfile b/core/gradle/dependency-locks/checkstyle.lockfile
index 11100d936..986396b59 100644
--- a/core/gradle/dependency-locks/checkstyle.lockfile
+++ b/core/gradle/dependency-locks/checkstyle.lockfile
@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:28.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.17
-commons-beanutils:commons-beanutils:1.9.3
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.24
+commons-beanutils:commons-beanutils:1.9.4
 commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.0
-net.sf.saxon:Saxon-HE:9.9.0-2
+info.picocli:picocli:4.0.3
+net.sf.saxon:Saxon-HE:9.9.1-4
 org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/core/gradle/dependency-locks/jacocoAgent.lockfile b/core/gradle/dependency-locks/jacocoAgent.lockfile
index e22f361cf..6b7fa31b5 100644
--- a/core/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/core/gradle/dependency-locks/jacocoAgent.lockfile
@@ -1,4 +1,4 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
+org.jacoco:org.jacoco.agent:0.8.5
diff --git a/core/gradle/dependency-locks/jacocoAnt.lockfile b/core/gradle/dependency-locks/jacocoAnt.lockfile
index 9a2c3a029..40e2c298b 100644
--- a/core/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/core/gradle/dependency-locks/jacocoAnt.lockfile
@@ -1,11 +1,11 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
-org.jacoco:org.jacoco.ant:0.8.4
-org.jacoco:org.jacoco.core:0.8.4
-org.jacoco:org.jacoco.report:0.8.4
-org.ow2.asm:asm-analysis:7.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:7.1
-org.ow2.asm:asm:7.1
+org.jacoco:org.jacoco.agent:0.8.5
+org.jacoco:org.jacoco.ant:0.8.5
+org.jacoco:org.jacoco.core:0.8.5
+org.jacoco:org.jacoco.report:0.8.5
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm:7.2
diff --git a/core/gradle/dependency-locks/testCompileOnly.lockfile b/core/gradle/dependency-locks/testCompileOnly.lockfile
index b308d7773..656c5dbcc 100644
--- a/core/gradle/dependency-locks/testCompileOnly.lockfile
+++ b/core/gradle/dependency-locks/testCompileOnly.lockfile
@@ -1,4 +1,3 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.google.appengine:appengine-api-1.0-sdk:1.9.48
diff --git a/db/build.gradle b/db/build.gradle
index f024e4984..7af313781 100644
--- a/db/build.gradle
+++ b/db/build.gradle
@@ -161,10 +161,12 @@ dependencies {
 
   testCompile deps['com.google.flogger:flogger']
   testRuntime deps['com.google.flogger:flogger-system-backend']
+  testCompile deps['com.google.guava:guava']
   testCompile deps['com.google.truth:truth']
   testCompile deps['io.github.java-diff-utils:java-diff-utils']
-  testCompile deps['org.testcontainers:postgresql']
   testCompile deps['junit:junit']
+  testCompile deps['org.testcontainers:postgresql']
+  testCompile deps['org.testcontainers:testcontainers']
   testCompile project(':third_party')
 }
 
diff --git a/db/gradle/dependency-locks/checkstyle.lockfile b/db/gradle/dependency-locks/checkstyle.lockfile
index 11100d936..986396b59 100644
--- a/db/gradle/dependency-locks/checkstyle.lockfile
+++ b/db/gradle/dependency-locks/checkstyle.lockfile
@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:28.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.17
-commons-beanutils:commons-beanutils:1.9.3
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.24
+commons-beanutils:commons-beanutils:1.9.4
 commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.0
-net.sf.saxon:Saxon-HE:9.9.0-2
+info.picocli:picocli:4.0.3
+net.sf.saxon:Saxon-HE:9.9.1-4
 org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/db/gradle/dependency-locks/jacocoAgent.lockfile b/db/gradle/dependency-locks/jacocoAgent.lockfile
index e22f361cf..6b7fa31b5 100644
--- a/db/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/db/gradle/dependency-locks/jacocoAgent.lockfile
@@ -1,4 +1,4 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
+org.jacoco:org.jacoco.agent:0.8.5
diff --git a/db/gradle/dependency-locks/jacocoAnt.lockfile b/db/gradle/dependency-locks/jacocoAnt.lockfile
index 9a2c3a029..40e2c298b 100644
--- a/db/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/db/gradle/dependency-locks/jacocoAnt.lockfile
@@ -1,11 +1,11 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
-org.jacoco:org.jacoco.ant:0.8.4
-org.jacoco:org.jacoco.core:0.8.4
-org.jacoco:org.jacoco.report:0.8.4
-org.ow2.asm:asm-analysis:7.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:7.1
-org.ow2.asm:asm:7.1
+org.jacoco:org.jacoco.agent:0.8.5
+org.jacoco:org.jacoco.ant:0.8.5
+org.jacoco:org.jacoco.core:0.8.5
+org.jacoco:org.jacoco.report:0.8.5
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm:7.2
diff --git a/db/gradle/dependency-locks/testCompile.lockfile b/db/gradle/dependency-locks/testCompile.lockfile
index 214ab83a7..0358d256f 100644
--- a/db/gradle/dependency-locks/testCompile.lockfile
+++ b/db/gradle/dependency-locks/testCompile.lockfile
@@ -3,12 +3,12 @@
 # This file is expected to be part of source control.
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.1
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.flogger:flogger:0.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-android
+com.google.guava:guava:28.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.truth:truth:1.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.kohlschutter.junixsocket:junixsocket-common:2.0.4
@@ -22,7 +22,8 @@ net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
 org.apache.commons:commons-compress:1.19
 org.checkerframework:checker-compat-qual:2.5.5
-org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.checkerframework:checker-qual:2.8.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.flywaydb:flyway-core:5.2.4
 org.hamcrest:hamcrest-core:1.3
diff --git a/db/gradle/dependency-locks/testCompileClasspath.lockfile b/db/gradle/dependency-locks/testCompileClasspath.lockfile
index 214ab83a7..0358d256f 100644
--- a/db/gradle/dependency-locks/testCompileClasspath.lockfile
+++ b/db/gradle/dependency-locks/testCompileClasspath.lockfile
@@ -3,12 +3,12 @@
 # This file is expected to be part of source control.
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.1
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.flogger:flogger:0.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-android
+com.google.guava:guava:28.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.truth:truth:1.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.kohlschutter.junixsocket:junixsocket-common:2.0.4
@@ -22,7 +22,8 @@ net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
 org.apache.commons:commons-compress:1.19
 org.checkerframework:checker-compat-qual:2.5.5
-org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.checkerframework:checker-qual:2.8.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.flywaydb:flyway-core:5.2.4
 org.hamcrest:hamcrest-core:1.3
diff --git a/db/gradle/dependency-locks/testRuntime.lockfile b/db/gradle/dependency-locks/testRuntime.lockfile
index de18ef83c..1417fc637 100644
--- a/db/gradle/dependency-locks/testRuntime.lockfile
+++ b/db/gradle/dependency-locks/testRuntime.lockfile
@@ -3,13 +3,13 @@
 # This file is expected to be part of source control.
 com.google.auto.value:auto-value-annotations:1.6.3
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.1
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.flogger:flogger-system-backend:0.1
 com.google.flogger:flogger:0.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-android
+com.google.guava:guava:28.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.truth:truth:1.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
 com.kohlschutter.junixsocket:junixsocket-common:2.0.4
@@ -23,7 +23,8 @@ net.java.dev.jna:jna-platform:5.3.1
 net.java.dev.jna:jna:5.3.1
 org.apache.commons:commons-compress:1.19
 org.checkerframework:checker-compat-qual:2.5.5
-org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.checkerframework:checker-qual:2.8.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.flywaydb:flyway-core:5.2.4
 org.hamcrest:hamcrest-core:1.3
diff --git a/db/gradle/dependency-locks/testRuntimeClasspath.lockfile b/db/gradle/dependency-locks/testRuntimeClasspath.lockfile
index 6107da948..51ff93bdc 100644
--- a/db/gradle/dependency-locks/testRuntimeClasspath.lockfile
+++ b/db/gradle/dependency-locks/testRuntimeClasspath.lockfile
@@ -16,15 +16,15 @@ com.google.auto.value:auto-value-annotations:1.6.3
 com.google.cloud.sql:jdbc-socket-factory-core:1.0.12
 com.google.cloud.sql:postgres-socket-factory:1.0.12
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.3.1
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.flogger:flogger-system-backend:0.1
 com.google.flogger:flogger:0.1
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-android
+com.google.guava:guava:28.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.http-client:google-http-client-jackson2:1.23.0
 com.google.http-client:google-http-client:1.23.0
-com.google.j2objc:j2objc-annotations:1.1
+com.google.j2objc:j2objc-annotations:1.3
 com.google.oauth-client:google-oauth-client:1.23.0
 com.google.truth:truth:1.0
 com.googlecode.java-diff-utils:diffutils:1.3.0
@@ -43,7 +43,8 @@ org.apache.commons:commons-compress:1.19
 org.apache.httpcomponents:httpclient:4.0.1
 org.apache.httpcomponents:httpcore:4.0.1
 org.checkerframework:checker-compat-qual:2.5.5
-org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.checkerframework:checker-qual:2.8.1
+org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.eclipse.jgit:org.eclipse.jgit:4.4.1.201607150455-r
 org.flywaydb:flyway-core:5.2.4
 org.hamcrest:hamcrest-core:1.3
diff --git a/dependencies.gradle b/dependencies.gradle
index babe7acc7..bd71919cb 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -18,8 +18,8 @@ ext {
     dependencyList = [
       'args4j:args4j:2.0.26',
       'com.beust:jcommander:1.60',
-      'com.google.api-client:google-api-client:1.29.2',
       'com.google.api-client:google-api-client-java6:1.27.0',
+      'com.google.api-client:google-api-client:1.29.2',
       'com.google.apis:google-api-services-admin-directory:directory_v1-rev72-1.22.0',
       'com.google.apis:google-api-services-appengine:v1-rev101-1.25.0',
       'com.google.apis:google-api-services-bigquery:v2-rev325-1.22.0',
@@ -31,46 +31,46 @@ ext {
       'com.google.apis:google-api-services-monitoring:v3-rev11-1.22.0',
       'com.google.apis:google-api-services-sheets:v4-rev483-1.22.0',
       'com.google.apis:google-api-services-storage:v1-rev150-1.22.0',
+      'com.google.appengine.tools:appengine-gcs-client:0.6',
+      'com.google.appengine.tools:appengine-mapreduce:0.9',
+      'com.google.appengine.tools:appengine-pipeline:0.2.13',
       'com.google.appengine:appengine-api-1.0-sdk:1.9.48',
       'com.google.appengine:appengine-api-stubs:1.9.48',
       'com.google.appengine:appengine-remote-api:1.9.48',
       'com.google.appengine:appengine-testing:1.9.58',
-      'com.google.appengine.tools:appengine-gcs-client:0.6',
-      'com.google.appengine.tools:appengine-mapreduce:0.9',
-      'com.google.appengine.tools:appengine-pipeline:0.2.13',
       'com.google.auth:google-auth-library-credentials:0.16.1',
       'com.google.auth:google-auth-library-oauth2-http:0.16.1',
-      'com.google.auto.value:auto-value:1.6.3',
       'com.google.auto.value:auto-value-annotations:1.6.3',
+      'com.google.auto.value:auto-value:1.6.3',
       'com.google.closure-stylesheets:closure-stylesheets:1.5.0',
+      'com.google.cloud.sql:postgres-socket-factory:1.0.12',
       'com.google.cloud:google-cloud-core:1.59.0',
       'com.google.cloud:google-cloud-storage:1.59.0',
-      'com.google.cloud.sql:postgres-socket-factory:1.0.12',
       'com.google.code.findbugs:jsr305:3.0.2',
       'com.google.code.gson:gson:2.8.5',
-      'com.googlecode.json-simple:json-simple:1.1.1',
-      'com.google.dagger:dagger:2.21',
       'com.google.dagger:dagger-compiler:2.21',
+      'com.google.dagger:dagger:2.21',
       'com.google.errorprone:error_prone_annotations:2.3.3',
-      'com.google.flogger:flogger:0.1',
       'com.google.flogger:flogger-system-backend:0.1',
-      'com.google.guava:guava:28.1-jre',
+      'com.google.flogger:flogger:0.1',
       'com.google.guava:guava-testlib:28.1-jre',
+      'com.google.guava:guava:28.1-jre',
       'com.google.gwt:gwt-user:2.8.2',
-      'com.google.http-client:google-http-client:1.29.2',
       'com.google.http-client:google-http-client-appengine:1.29.2',
       'com.google.http-client:google-http-client-jackson2:1.29.2',
+      'com.google.http-client:google-http-client:1.29.2',
       'com.google.javascript:closure-compiler:v20190301',
       'com.google.monitoring-client:contrib:1.0.6',
       'com.google.monitoring-client:metrics:1.0.6',
       'com.google.monitoring-client:stackdriver:1.0.6',
-      'com.google.oauth-client:google-oauth-client:1.29.2',
       'com.google.oauth-client:google-oauth-client-java6:1.27.0',
       'com.google.oauth-client:google-oauth-client-jetty:1.28.0',
+      'com.google.oauth-client:google-oauth-client:1.29.2',
       'com.google.re2j:re2j:1.1',
       'com.google.template:soy:2018-03-14',
       'com.google.truth.extensions:truth-java8-extension:1.0',
       'com.google.truth:truth:1.0',
+      'com.googlecode.json-simple:json-simple:1.1.1',
       'com.ibm.icu:icu4j:57.1',
       'com.jcraft:jsch:0.1.55',
       'com.sun.activation:javax.activation:1.2.0',
@@ -82,15 +82,17 @@ ext {
       'io.github.classgraph:classgraph:4.8.52',
       'io.github.java-diff-utils:java-diff-utils:4.0',
       'io.netty:netty-buffer:4.1.31.Final',
-      'io.netty:netty-codec:4.1.31.Final',
       'io.netty:netty-codec-http:4.1.31.Final',
+      'io.netty:netty-codec:4.1.31.Final',
       'io.netty:netty-common:4.1.31.Final',
       'io.netty:netty-handler:4.1.31.Final',
       'io.netty:netty-tcnative-boringssl-static:2.0.22.Final',
       'io.netty:netty-transport:4.1.31.Final',
+      'javax.annotation:javax.annotation-api:1.3.2',
       'javax.annotation:jsr250-api:1.0',
       'javax.inject:javax.inject:1',
       'javax.mail:mail:1.4',
+      'javax.persistence:javax.persistence-api:2.2',
       'javax.servlet:servlet-api:2.5',
       'javax.xml.bind:jaxb-api:2.3.0',
       'jline:jline:1.0',
@@ -102,6 +104,7 @@ ext {
       'org.apache.beam:beam-sdks-java-core:2.16.0',
       'org.apache.beam:beam-sdks-java-extensions-google-cloud-platform-core:2.16.0',
       'org.apache.beam:beam-sdks-java-io-google-cloud-platform:2.16.0',
+      'org.apache.commons:commons-lang3:3.8.1',
       'org.apache.commons:commons-text:1.6',
       'org.apache.ftpserver:ftplet-api:1.0.6',
       'org.apache.ftpserver:ftpserver-core:1.0.6',
@@ -119,6 +122,7 @@ ext {
       'org.hamcrest:hamcrest-all:1.3',
       'org.hamcrest:hamcrest-core:1.3',
       'org.hamcrest:hamcrest-library:1.3',
+      'org.hibernate:hibernate-core:5.4.4.Final',
       'org.hibernate:hibernate-hikaricp:5.4.4.Final',
       'org.joda:joda-money:1.0.1',
       'org.json:json:20160810',
@@ -129,8 +133,10 @@ ext {
       'org.seleniumhq.selenium:selenium-chrome-driver:3.141.59',
       'org.seleniumhq.selenium:selenium-java:3.141.59',
       'org.seleniumhq.selenium:selenium-remote-driver:3.141.59',
+      'org.testcontainers:jdbc:1.12.1',
       'org.testcontainers:postgresql:1.12.1',
       'org.testcontainers:selenium:1.12.1',
+      'org.testcontainers:testcontainers:1.12.1',
       'org.yaml:snakeyaml:1.17',
       'xerces:xmlParserAPIs:2.6.2',
       'xpp3:xpp3:1.1.4c'
diff --git a/gradle/dependency-locks/buildscript-classpath.lockfile b/gradle/dependency-locks/buildscript-classpath.lockfile
index 41f8050a4..7b1b77341 100644
--- a/gradle/dependency-locks/buildscript-classpath.lockfile
+++ b/gradle/dependency-locks/buildscript-classpath.lockfile
@@ -1,14 +1,13 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-cglib:cglib-nodep:3.2.2
 com.diffplug.durian:durian-collect:1.2.0
 com.diffplug.durian:durian-core:1.2.0
 com.diffplug.durian:durian-io:1.2.0
-com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:3.18.0
-com.diffplug.spotless:spotless-lib-extra:1.18.0
-com.diffplug.spotless:spotless-lib:1.18.0
-com.diffplug.spotless:spotless-plugin-gradle:3.18.0
+com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:3.25.0
+com.diffplug.spotless:spotless-lib-extra:1.25.0
+com.diffplug.spotless:spotless-lib:1.25.0
+com.diffplug.spotless:spotless-plugin-gradle:3.25.0
 com.github.jengelman.gradle.plugins:shadow:5.1.0
 com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:5.1.0
 com.google.cloud.tools:appengine-gradle-plugin:2.0.1
@@ -22,73 +21,61 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.googlecode.concurrent-trees:concurrent-trees:2.6.1
 com.googlecode.javaewah:JavaEWAH:1.1.6
-com.jcraft:jsch:0.1.54
+com.jcraft:jsch:0.1.55
 com.jcraft:jzlib:1.1.1
 com.moowork.gradle:gradle-node-plugin:1.2.0
 com.moowork.node:com.moowork.node.gradle.plugin:1.2.0
-com.netflix.nebula:gradle-lint-plugin:10.4.2
-com.netflix.nebula:nebula-gradle-interop:1.0.7
-com.netflix.nebula:nebula-test:7.2.5
-commons-codec:commons-codec:1.9
+com.netflix.nebula:gradle-lint-plugin:16.0.2
+com.netflix.nebula:nebula-gradle-interop:1.0.11
 commons-io:commons-io:2.6
 commons-lang:commons-lang:2.6
-commons-logging:commons-logging:1.2
+javax.inject:javax.inject:1
 junit:junit:4.12
-log4j:log4j:1.2.14
-nebula.lint:nebula.lint.gradle.plugin:10.4.2
+nebula.lint:nebula.lint.gradle.plugin:16.0.2
 net.ltgt.apt:net.ltgt.apt.gradle.plugin:0.19
 net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:0.6.1
 net.ltgt.gradle:gradle-apt-plugin:0.19
 net.ltgt.gradle:gradle-errorprone-plugin:0.6.1
-org.apache.ant:ant-antlr:1.8.4
-org.apache.ant:ant-junit:1.8.4
 org.apache.ant:ant-launcher:1.9.7
 org.apache.ant:ant:1.9.7
 org.apache.commons:commons-compress:1.18
 org.apache.commons:commons-lang3:3.8.1
-org.apache.httpcomponents:httpclient:4.5.2
-org.apache.httpcomponents:httpcore:4.4.4
 org.apache.logging.log4j:log4j-api:2.11.0
 org.apache.logging.log4j:log4j-core:2.11.0
-org.apache.maven:maven-artifact:3.6.1
-org.apache.maven:maven-builder-support:3.6.1
-org.apache.maven:maven-model-builder:3.6.1
-org.apache.maven:maven-model:3.6.1
+org.apache.maven:maven-artifact:3.6.2
+org.apache.maven:maven-builder-support:3.6.2
+org.apache.maven:maven-model-builder:3.6.2
+org.apache.maven:maven-model:3.6.2
+org.bouncycastle:bcpg-jdk15on:1.61
+org.bouncycastle:bcpkix-jdk15on:1.61
+org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.gpars:gpars:1.2.1
-org.codehaus.groovy:groovy-all:2.4.9
-org.codehaus.groovy:groovy-ant:2.1.8
-org.codehaus.groovy:groovy-groovydoc:2.1.8
-org.codehaus.groovy:groovy-templates:2.1.8
 org.codehaus.groovy:groovy-xml:2.4.7
 org.codehaus.groovy:groovy:2.4.7
 org.codehaus.jsr166-mirror:jsr166y:1.7.0
 org.codehaus.mojo:animal-sniffer-annotations:1.17
-org.codehaus.plexus:plexus-component-annotations:1.7.1
 org.codehaus.plexus:plexus-interpolation:1.25
-org.codehaus.plexus:plexus-utils:3.2.0
-org.codenarc:CodeNarc:0.25.2
-org.eclipse.jdt:core:3.1.1
-org.eclipse.jgit:org.eclipse.jgit:5.0.1.201806211838-r
+org.codehaus.plexus:plexus-utils:3.2.1
+org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r
+org.eclipse.sisu:org.eclipse.sisu.inject:0.3.3
 org.glassfish:javax.json:1.0.4
-org.gmetrics:GMetrics:0.7
 org.hamcrest:hamcrest-core:1.3
 org.jdom:jdom2:2.0.6
-org.jetbrains.kotlin:kotlin-stdlib-common:1.3.11
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11
-org.jetbrains.kotlin:kotlin-stdlib:1.3.11
+org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
+org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains:annotations:13.0
 org.multiverse:multiverse-core:0.7.0
-org.objenesis:objenesis:2.4
-org.ow2.asm:asm-analysis:7.0-beta
-org.ow2.asm:asm-commons:7.0-beta
-org.ow2.asm:asm-tree:7.0-beta
-org.ow2.asm:asm:7.0
+org.ow2.asm:asm-analysis:7.1
+org.ow2.asm:asm-commons:7.1
+org.ow2.asm:asm-tree:7.1
+org.ow2.asm:asm:7.1
 org.slf4j:slf4j-api:1.7.2
 org.sonatype.aether:aether-api:1.13.1
 org.sonatype.aether:aether-impl:1.13.1
 org.sonatype.aether:aether-spi:1.13.1
 org.sonatype.aether:aether-util:1.13.1
-org.spockframework:spock-core:1.1-groovy-2.4-rc-4
 org.vafer:jdependency:2.1.1
 org.yaml:snakeyaml:1.21
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf01..cc4fdc293 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a54a3332..562e2c884 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acfdc..2fe81a7d9 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/prober/build.gradle b/prober/build.gradle
index 3c343dccd..98034b00a 100644
--- a/prober/build.gradle
+++ b/prober/build.gradle
@@ -27,8 +27,8 @@ dependencies {
     compile deps['com.google.guava:guava']
     compile deps['com.google.monitoring-client:metrics']
     compile deps['io.netty:netty-buffer']
-    compile deps['io.netty:netty-codec-http']
     compile deps['io.netty:netty-codec']
+    compile deps['io.netty:netty-codec-http']
     compile deps['io.netty:netty-common']
     compile deps['io.netty:netty-handler']
     compile deps['io.netty:netty-transport']
@@ -36,6 +36,8 @@ dependencies {
     compile deps['joda-time:joda-time']
     compile deps['org.bouncycastle:bcpkix-jdk15on']
     compile deps['org.bouncycastle:bcprov-jdk15on']
+    compile deps['xerces:xmlParserAPIs']
+    compile deps['xpp3:xpp3']
     compile project(':util')
 
     runtime deps['com.google.flogger:flogger-system-backend']
diff --git a/prober/gradle/dependency-locks/checkstyle.lockfile b/prober/gradle/dependency-locks/checkstyle.lockfile
index 11100d936..986396b59 100644
--- a/prober/gradle/dependency-locks/checkstyle.lockfile
+++ b/prober/gradle/dependency-locks/checkstyle.lockfile
@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:28.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.17
-commons-beanutils:commons-beanutils:1.9.3
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.24
+commons-beanutils:commons-beanutils:1.9.4
 commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.0
-net.sf.saxon:Saxon-HE:9.9.0-2
+info.picocli:picocli:4.0.3
+net.sf.saxon:Saxon-HE:9.9.1-4
 org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/prober/gradle/dependency-locks/compile.lockfile b/prober/gradle/dependency-locks/compile.lockfile
index 061576fb6..302965bb4 100644
--- a/prober/gradle/dependency-locks/compile.lockfile
+++ b/prober/gradle/dependency-locks/compile.lockfile
@@ -48,3 +48,5 @@ org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.yaml:snakeyaml:1.17
+xerces:xmlParserAPIs:2.6.2
+xpp3:xpp3:1.1.4c
diff --git a/prober/gradle/dependency-locks/compileClasspath.lockfile b/prober/gradle/dependency-locks/compileClasspath.lockfile
index 061576fb6..302965bb4 100644
--- a/prober/gradle/dependency-locks/compileClasspath.lockfile
+++ b/prober/gradle/dependency-locks/compileClasspath.lockfile
@@ -48,3 +48,5 @@ org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.yaml:snakeyaml:1.17
+xerces:xmlParserAPIs:2.6.2
+xpp3:xpp3:1.1.4c
diff --git a/prober/gradle/dependency-locks/default.lockfile b/prober/gradle/dependency-locks/default.lockfile
index 59a69f0f3..02a5f81ec 100644
--- a/prober/gradle/dependency-locks/default.lockfile
+++ b/prober/gradle/dependency-locks/default.lockfile
@@ -50,3 +50,5 @@ org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.yaml:snakeyaml:1.17
+xerces:xmlParserAPIs:2.6.2
+xpp3:xpp3:1.1.4c
diff --git a/prober/gradle/dependency-locks/jacocoAgent.lockfile b/prober/gradle/dependency-locks/jacocoAgent.lockfile
index e22f361cf..6b7fa31b5 100644
--- a/prober/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/prober/gradle/dependency-locks/jacocoAgent.lockfile
@@ -1,4 +1,4 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
+org.jacoco:org.jacoco.agent:0.8.5
diff --git a/prober/gradle/dependency-locks/jacocoAnt.lockfile b/prober/gradle/dependency-locks/jacocoAnt.lockfile
index 9a2c3a029..40e2c298b 100644
--- a/prober/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/prober/gradle/dependency-locks/jacocoAnt.lockfile
@@ -1,11 +1,11 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
-org.jacoco:org.jacoco.ant:0.8.4
-org.jacoco:org.jacoco.core:0.8.4
-org.jacoco:org.jacoco.report:0.8.4
-org.ow2.asm:asm-analysis:7.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:7.1
-org.ow2.asm:asm:7.1
+org.jacoco:org.jacoco.agent:0.8.5
+org.jacoco:org.jacoco.ant:0.8.5
+org.jacoco:org.jacoco.core:0.8.5
+org.jacoco:org.jacoco.report:0.8.5
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm:7.2
diff --git a/prober/gradle/dependency-locks/runtime.lockfile b/prober/gradle/dependency-locks/runtime.lockfile
index 59a69f0f3..02a5f81ec 100644
--- a/prober/gradle/dependency-locks/runtime.lockfile
+++ b/prober/gradle/dependency-locks/runtime.lockfile
@@ -50,3 +50,5 @@ org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.yaml:snakeyaml:1.17
+xerces:xmlParserAPIs:2.6.2
+xpp3:xpp3:1.1.4c
diff --git a/prober/gradle/dependency-locks/runtimeClasspath.lockfile b/prober/gradle/dependency-locks/runtimeClasspath.lockfile
index 59a69f0f3..02a5f81ec 100644
--- a/prober/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/prober/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -50,3 +50,5 @@ org.bouncycastle:bcprov-jdk15on:1.61
 org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.yaml:snakeyaml:1.17
+xerces:xmlParserAPIs:2.6.2
+xpp3:xpp3:1.1.4c
diff --git a/proxy/gradle/dependency-locks/checkstyle.lockfile b/proxy/gradle/dependency-locks/checkstyle.lockfile
index 11100d936..986396b59 100644
--- a/proxy/gradle/dependency-locks/checkstyle.lockfile
+++ b/proxy/gradle/dependency-locks/checkstyle.lockfile
@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:28.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.17
-commons-beanutils:commons-beanutils:1.9.3
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.24
+commons-beanutils:commons-beanutils:1.9.4
 commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.0
-net.sf.saxon:Saxon-HE:9.9.0-2
+info.picocli:picocli:4.0.3
+net.sf.saxon:Saxon-HE:9.9.1-4
 org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/proxy/gradle/dependency-locks/jacocoAgent.lockfile b/proxy/gradle/dependency-locks/jacocoAgent.lockfile
index e22f361cf..6b7fa31b5 100644
--- a/proxy/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/proxy/gradle/dependency-locks/jacocoAgent.lockfile
@@ -1,4 +1,4 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
+org.jacoco:org.jacoco.agent:0.8.5
diff --git a/proxy/gradle/dependency-locks/jacocoAnt.lockfile b/proxy/gradle/dependency-locks/jacocoAnt.lockfile
index 9a2c3a029..40e2c298b 100644
--- a/proxy/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/proxy/gradle/dependency-locks/jacocoAnt.lockfile
@@ -1,11 +1,11 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
-org.jacoco:org.jacoco.ant:0.8.4
-org.jacoco:org.jacoco.core:0.8.4
-org.jacoco:org.jacoco.report:0.8.4
-org.ow2.asm:asm-analysis:7.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:7.1
-org.ow2.asm:asm:7.1
+org.jacoco:org.jacoco.agent:0.8.5
+org.jacoco:org.jacoco.ant:0.8.5
+org.jacoco:org.jacoco.core:0.8.5
+org.jacoco:org.jacoco.report:0.8.5
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm:7.2
diff --git a/third_party/gradle/dependency-locks/checkstyle.lockfile b/third_party/gradle/dependency-locks/checkstyle.lockfile
index 11100d936..986396b59 100644
--- a/third_party/gradle/dependency-locks/checkstyle.lockfile
+++ b/third_party/gradle/dependency-locks/checkstyle.lockfile
@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:28.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.17
-commons-beanutils:commons-beanutils:1.9.3
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.24
+commons-beanutils:commons-beanutils:1.9.4
 commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.0
-net.sf.saxon:Saxon-HE:9.9.0-2
+info.picocli:picocli:4.0.3
+net.sf.saxon:Saxon-HE:9.9.1-4
 org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/third_party/gradle/dependency-locks/jacocoAgent.lockfile b/third_party/gradle/dependency-locks/jacocoAgent.lockfile
index e22f361cf..6b7fa31b5 100644
--- a/third_party/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/third_party/gradle/dependency-locks/jacocoAgent.lockfile
@@ -1,4 +1,4 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
+org.jacoco:org.jacoco.agent:0.8.5
diff --git a/third_party/gradle/dependency-locks/jacocoAnt.lockfile b/third_party/gradle/dependency-locks/jacocoAnt.lockfile
index 9a2c3a029..40e2c298b 100644
--- a/third_party/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/third_party/gradle/dependency-locks/jacocoAnt.lockfile
@@ -1,11 +1,11 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
-org.jacoco:org.jacoco.ant:0.8.4
-org.jacoco:org.jacoco.core:0.8.4
-org.jacoco:org.jacoco.report:0.8.4
-org.ow2.asm:asm-analysis:7.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:7.1
-org.ow2.asm:asm:7.1
+org.jacoco:org.jacoco.agent:0.8.5
+org.jacoco:org.jacoco.ant:0.8.5
+org.jacoco:org.jacoco.core:0.8.5
+org.jacoco:org.jacoco.report:0.8.5
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm:7.2
diff --git a/util/build.gradle b/util/build.gradle
index 5e77780a0..9684712c3 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -24,6 +24,7 @@ dependencies {
   compile deps['com.google.dagger:dagger']
   compile deps['com.google.flogger:flogger']
   compile deps['com.google.guava:guava']
+  compile deps['com.google.http-client:google-http-client']
   compile deps['com.google.re2j:re2j']
   compile deps['com.ibm.icu:icu4j']
   compile deps['javax.inject:javax.inject']
diff --git a/util/gradle/dependency-locks/checkstyle.lockfile b/util/gradle/dependency-locks/checkstyle.lockfile
index 11100d936..986396b59 100644
--- a/util/gradle/dependency-locks/checkstyle.lockfile
+++ b/util/gradle/dependency-locks/checkstyle.lockfile
@@ -3,16 +3,16 @@
 # This file is expected to be part of source control.
 antlr:antlr:2.7.7
 com.google.code.findbugs:jsr305:3.0.2
-com.google.errorprone:error_prone_annotations:2.2.0
+com.google.errorprone:error_prone_annotations:2.3.2
 com.google.guava:failureaccess:1.0.1
-com.google.guava:guava:27.0.1-jre
+com.google.guava:guava:28.0-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
-com.google.j2objc:j2objc-annotations:1.1
-com.puppycrawl.tools:checkstyle:8.17
-commons-beanutils:commons-beanutils:1.9.3
+com.google.j2objc:j2objc-annotations:1.3
+com.puppycrawl.tools:checkstyle:8.24
+commons-beanutils:commons-beanutils:1.9.4
 commons-collections:commons-collections:3.2.2
-info.picocli:picocli:3.9.0
-net.sf.saxon:Saxon-HE:9.9.0-2
+info.picocli:picocli:4.0.3
+net.sf.saxon:Saxon-HE:9.9.1-4
 org.antlr:antlr4-runtime:4.7.2
-org.checkerframework:checker-qual:2.5.2
+org.checkerframework:checker-qual:2.8.1
 org.codehaus.mojo:animal-sniffer-annotations:1.17
diff --git a/util/gradle/dependency-locks/jacocoAgent.lockfile b/util/gradle/dependency-locks/jacocoAgent.lockfile
index e22f361cf..6b7fa31b5 100644
--- a/util/gradle/dependency-locks/jacocoAgent.lockfile
+++ b/util/gradle/dependency-locks/jacocoAgent.lockfile
@@ -1,4 +1,4 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
+org.jacoco:org.jacoco.agent:0.8.5
diff --git a/util/gradle/dependency-locks/jacocoAnt.lockfile b/util/gradle/dependency-locks/jacocoAnt.lockfile
index 9a2c3a029..40e2c298b 100644
--- a/util/gradle/dependency-locks/jacocoAnt.lockfile
+++ b/util/gradle/dependency-locks/jacocoAnt.lockfile
@@ -1,11 +1,11 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-org.jacoco:org.jacoco.agent:0.8.4
-org.jacoco:org.jacoco.ant:0.8.4
-org.jacoco:org.jacoco.core:0.8.4
-org.jacoco:org.jacoco.report:0.8.4
-org.ow2.asm:asm-analysis:7.1
-org.ow2.asm:asm-commons:7.1
-org.ow2.asm:asm-tree:7.1
-org.ow2.asm:asm:7.1
+org.jacoco:org.jacoco.agent:0.8.5
+org.jacoco:org.jacoco.ant:0.8.5
+org.jacoco:org.jacoco.core:0.8.5
+org.jacoco:org.jacoco.report:0.8.5
+org.ow2.asm:asm-analysis:7.2
+org.ow2.asm:asm-commons:7.2
+org.ow2.asm:asm-tree:7.2
+org.ow2.asm:asm:7.2