diff --git a/.travis.yml b/.travis.yml
index a0829469dfc3..11ab56d92e9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,18 @@ dist: bionic
 matrix:
   include:
   - language: java
+    name: java11
+    jdk: openjdk11
+    before_cache:
+      - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+      - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+    cache:
+      directories:
+        - $HOME/.gradle/caches/
+        - $HOME/.gradle/wrapper/
+  - language: java
+    name: java8
     jdk: openjdk8
-    name: java
     before_cache:
       - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
       - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
diff --git a/build.gradle b/build.gradle
index 1f56f501cc2c..bacc0c2c6b0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,10 +40,6 @@ plugins {
   id 'com.palantir.consistent-versions' version '1.9.2'
 }
 
-if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-  throw new GradleException("This build must be run with Java 8")
-}
-
 allprojects {
   group = "org.apache.iceberg"
   version = getProjectVersion()
@@ -54,6 +50,9 @@ allprojects {
   }
 }
 
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
+
 subprojects {
   apply plugin: 'java'
 
@@ -321,7 +320,7 @@ project(':iceberg-spark') {
     compile project(':iceberg-hive')
 
     compileOnly "org.apache.avro:avro"
-    compileOnly("org.apache.spark:spark-hive_2.11") {
+    compileOnly("org.apache.spark:spark-hive_2.12") {
       exclude group: 'org.apache.avro', module: 'avro'
     }
 
@@ -348,7 +347,7 @@ project(':iceberg-spark') {
     // dependency only to the jmh configuration, however gradle-consistent-versions
     // plugin does not respect this configuration and does not seem to have a way
     // to add custom configurations in its lockable configuration detection
-    compileOnly("org.apache.spark:spark-avro_2.11") {
+    compileOnly("org.apache.spark:spark-avro_2.12") {
       exclude group: 'org.apache.avro', module: 'avro'
     }
   }
diff --git a/deploy.gradle b/deploy.gradle
index 29e5a1f21231..2b3999b192d9 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -17,6 +17,10 @@
  * under the License.
  */
 
+if (project.hasProperty('release') && JavaVersion.current() != JavaVersion.VERSION_1_8) {
+  throw new GradleException("Releases must be built with Java 8")
+}
+
 subprojects {
   apply plugin: 'maven' // make pom files for deployment
   apply plugin: 'maven-publish'
diff --git a/hive/src/test/java/org/apache/iceberg/hive/HiveMetastoreTest.java b/hive/src/test/java/org/apache/iceberg/hive/HiveMetastoreTest.java
index 8d08aff88f21..1fbda4f5f3dc 100644
--- a/hive/src/test/java/org/apache/iceberg/hive/HiveMetastoreTest.java
+++ b/hive/src/test/java/org/apache/iceberg/hive/HiveMetastoreTest.java
@@ -49,13 +49,19 @@ public static void startMetastore() throws Exception {
 
   @AfterClass
   public static void stopMetastore() {
-    catalog.close();
-    HiveMetastoreTest.catalog = null;
+    if (catalog != null) {
+      catalog.close();
+      HiveMetastoreTest.catalog = null;
+    }
 
-    metastoreClient.close();
-    HiveMetastoreTest.metastoreClient = null;
+    if (metastoreClient != null) {
+      metastoreClient.close();
+      HiveMetastoreTest.metastoreClient = null;
+    }
 
-    metastore.stop();
-    HiveMetastoreTest.metastore = null;
+    if (metastore != null) {
+      metastore.stop();
+      HiveMetastoreTest.metastore = null;
+    }
   }
 }
diff --git a/versions.lock b/versions.lock
index f94a0ca1d756..2d6b300ef9bf 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,21 +1,23 @@
 # Run ./gradlew --write-locks to regenerate this file
 ant:ant:1.6.5 (1 constraints: 730a54bc)
 aopalliance:aopalliance:1.0 (1 constraints: 170a83ac)
-asm:asm:3.1 (2 constraints: 4f19c3c6)
-com.carrotsearch:hppc:0.7.2 (1 constraints: f70cda14)
-com.clearspring.analytics:stream:2.7.0 (1 constraints: 1a0dd136)
-com.esotericsoftware:kryo-shaded:4.0.2 (2 constraints: b71345a6)
+asm:asm:3.1 (3 constraints: 251fd7ad)
+asm:asm-commons:3.1 (1 constraints: 9c0f1f7a)
+asm:asm-tree:3.1 (1 constraints: 2307035c)
+com.clearspring.analytics:stream:2.9.6 (1 constraints: 230de736)
+com.esotericsoftware:kryo-shaded:4.0.2 (2 constraints: b8134fa6)
 com.esotericsoftware:minlog:1.3.0 (1 constraints: 670e7c4f)
-com.fasterxml.jackson.core:jackson-annotations:2.10.2 (5 constraints: 4155160f)
-com.fasterxml.jackson.core:jackson-core:2.10.2 (6 constraints: bb52b302)
-com.fasterxml.jackson.core:jackson-databind:2.10.2 (11 constraints: 849efe9c)
-com.fasterxml.jackson.module:jackson-module-paranamer:2.10.2 (1 constraints: 03162c16)
-com.fasterxml.jackson.module:jackson-module-scala_2.11:2.10.2 (1 constraints: 7f0da251)
+com.fasterxml.jackson.core:jackson-annotations:2.10.2 (5 constraints: 8c55aeb0)
+com.fasterxml.jackson.core:jackson-core:2.10.2 (6 constraints: e1520556)
+com.fasterxml.jackson.core:jackson-databind:2.10.2 (11 constraints: 029e3e39)
+com.fasterxml.jackson.module:jackson-module-paranamer:2.10.2 (1 constraints: 04163716)
+com.fasterxml.jackson.module:jackson-module-scala_2.12:2.10.2 (1 constraints: 450d1044)
 com.github.ben-manes.caffeine:caffeine:2.7.0 (1 constraints: 0b050a36)
 com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 (1 constraints: e90b08f3)
-com.github.luben:zstd-jni:1.3.2-2 (1 constraints: 760d7c51)
+com.github.luben:zstd-jni:1.4.4-3 (1 constraints: 7b0d9451)
+com.github.spotbugs:spotbugs-annotations:3.1.9 (1 constraints: 8d0d3128)
 com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 (1 constraints: 6d05ab40)
-com.google.code.findbugs:jsr305:3.0.2 (7 constraints: fc5db58f)
+com.google.code.findbugs:jsr305:3.0.2 (9 constraints: 077b3656)
 com.google.code.gson:gson:2.2.4 (2 constraints: 9518bfd2)
 com.google.errorprone:error_prone_annotations:2.3.3 (2 constraints: 161a2544)
 com.google.flatbuffers:flatbuffers-java:1.9.0 (2 constraints: e5199714)
@@ -26,209 +28,224 @@ com.google.inject:guice:3.0 (6 constraints: 6873914c)
 com.google.inject.extensions:guice-servlet:3.0 (11 constraints: a9d50a2b)
 com.google.j2objc:j2objc-annotations:1.3 (1 constraints: b809eda0)
 com.google.protobuf:protobuf-java:2.5.0 (16 constraints: 2f1c978f)
-com.googlecode.javaewah:JavaEWAH:0.3.2 (1 constraints: ea0dfc42)
 com.jamesmurty.utils:java-xmlbuilder:0.4 (1 constraints: e40aa5ca)
-com.jcraft:jsch:0.1.42 (1 constraints: bb0ded3c)
-com.jolbox:bonecp:0.8.0.RELEASE (2 constraints: b22109f9)
-com.ning:compress-lzf:1.0.3 (1 constraints: 150dba36)
+com.jcraft:jsch:0.1.54 (1 constraints: be0df13c)
+com.jolbox:bonecp:0.8.0.RELEASE (1 constraints: 680fc193)
+com.ning:compress-lzf:1.0.3 (1 constraints: 160dc436)
 com.sun.jersey:jersey-client:1.9 (4 constraints: 65529ed7)
 com.sun.jersey:jersey-core:1.9 (9 constraints: ec8f4404)
 com.sun.jersey:jersey-json:1.9 (5 constraints: 945f2f90)
 com.sun.jersey:jersey-server:1.9 (4 constraints: ef373c01)
 com.sun.jersey.contribs:jersey-guice:1.9 (4 constraints: 65529ed7)
 com.sun.xml.bind:jaxb-impl:2.2.3-1 (1 constraints: 330c2404)
-com.thoughtworks.paranamer:paranamer:2.8 (3 constraints: 742d4cb1)
-com.twitter:chill-java:0.9.3 (2 constraints: a716716f)
-com.twitter:chill_2.11:0.9.3 (2 constraints: 121b92c3)
-com.twitter:parquet-hadoop-bundle:1.6.0 (2 constraints: 061b4d93)
-com.univocity:univocity-parsers:2.7.3 (1 constraints: c40ccb27)
+com.tdunning:json:1.8 (1 constraints: 910b72db)
+com.thoughtworks.paranamer:paranamer:2.8 (3 constraints: 762d7eb1)
+com.twitter:chill-java:0.9.3 (2 constraints: a916ae6f)
+com.twitter:chill_2.12:0.9.3 (2 constraints: 141bd1c3)
+com.univocity:univocity-parsers:2.8.3 (2 constraints: a01b9ef6)
+com.zaxxer:HikariCP:2.5.1 (1 constraints: 390d7120)
 commons-beanutils:commons-beanutils:1.7.0 (1 constraints: da0e635f)
 commons-beanutils:commons-beanutils-core:1.8.0 (1 constraints: 1d134124)
-commons-cli:commons-cli:1.2 (9 constraints: f874366c)
-commons-codec:commons-codec:1.10 (17 constraints: a8de3870)
+commons-cli:commons-cli:1.2 (8 constraints: 40657789)
+commons-codec:commons-codec:1.10 (17 constraints: aade7270)
 commons-collections:commons-collections:3.2.2 (3 constraints: e73a8e36)
 commons-configuration:commons-configuration:1.6 (1 constraints: 2d0d5c14)
 commons-daemon:commons-daemon:1.0.13 (1 constraints: d50c811c)
-commons-dbcp:commons-dbcp:1.4 (3 constraints: 9029e0e4)
+commons-dbcp:commons-dbcp:1.4 (1 constraints: d80c2c06)
 commons-digester:commons-digester:1.8 (1 constraints: bf1228fe)
 commons-el:commons-el:1.0 (2 constraints: ad11e7f0)
-commons-httpclient:commons-httpclient:3.1 (4 constraints: e52cc77f)
-commons-io:commons-io:2.4 (6 constraints: 4a568049)
-commons-lang:commons-lang:2.6 (20 constraints: 401f63f3)
-commons-logging:commons-logging:1.2 (20 constraints: 424b646e)
-commons-net:commons-net:3.1 (3 constraints: 3d222e61)
-commons-pool:commons-pool:1.6 (4 constraints: e336ab5e)
+commons-httpclient:commons-httpclient:3.1 (4 constraints: e62ccf7f)
+commons-io:commons-io:2.4 (5 constraints: be48af0c)
+commons-lang:commons-lang:2.6 (18 constraints: f5016b5a)
+commons-logging:commons-logging:1.2 (19 constraints: 2a3b8631)
+commons-net:commons-net:3.1 (3 constraints: 3e223661)
+commons-pool:commons-pool:1.6 (3 constraints: c626e5cb)
 dk.brics.automaton:automaton:1.11-8 (1 constraints: 92088a8d)
 hsqldb:hsqldb:1.8.0.10 (1 constraints: f008499f)
 io.airlift:aircompressor:0.15 (1 constraints: 0e0aa4b2)
-io.dropwizard.metrics:metrics-core:3.1.5 (8 constraints: 3b8585b8)
-io.dropwizard.metrics:metrics-graphite:3.1.5 (1 constraints: 1a0dc936)
-io.dropwizard.metrics:metrics-json:3.1.5 (2 constraints: 03195c12)
-io.dropwizard.metrics:metrics-jvm:3.1.5 (2 constraints: 03195c12)
-io.netty:netty:3.9.9.Final (9 constraints: 9eb0396d)
-io.netty:netty-all:4.1.42.Final (3 constraints: ce319b25)
+io.dropwizard.metrics:metrics-core:4.1.1 (9 constraints: e7936872)
+io.dropwizard.metrics:metrics-graphite:4.1.1 (1 constraints: 180dd436)
+io.dropwizard.metrics:metrics-jmx:4.1.1 (1 constraints: 180dd436)
+io.dropwizard.metrics:metrics-json:4.1.1 (2 constraints: 01196712)
+io.dropwizard.metrics:metrics-jvm:4.1.1 (2 constraints: 01196712)
+io.netty:netty:3.10.6.Final (8 constraints: 91a1ee0f)
+io.netty:netty-all:4.1.42.Final (3 constraints: d031f725)
 io.netty:netty-buffer:4.1.27.Final (1 constraints: 4a0fee77)
-javax.activation:activation:1.1.1 (1 constraints: 140dbb36)
-javax.annotation:javax.annotation-api:1.3.2 (3 constraints: 55341c48)
-javax.inject:javax.inject:1 (4 constraints: 852d0c1a)
-javax.jdo:jdo-api:3.0.1 (2 constraints: 4c1dcc1a)
-javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 150dc436)
+jakarta.annotation:jakarta.annotation-api:1.3.5 (4 constraints: 0a3a4179)
+jakarta.validation:jakarta.validation-api:2.0.2 (1 constraints: fd10b6c3)
+jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (5 constraints: 8c647f61)
+javax.activation:activation:1.1.1 (3 constraints: b12367a0)
+javax.annotation:javax.annotation-api:1.3.2 (1 constraints: 29133a28)
+javax.inject:javax.inject:1 (2 constraints: b018a173)
+javax.jdo:jdo-api:3.0.1 (1 constraints: 350d6720)
+javax.mail:mail:1.4.1 (1 constraints: fc0fe399)
+javax.servlet:javax.servlet-api:3.1.0 (1 constraints: 160dce36)
 javax.servlet:jsp-api:2.0 (1 constraints: 0b0aa0a7)
 javax.servlet:servlet-api:2.5 (9 constraints: f991a6d2)
 javax.servlet.jsp:jsp-api:2.1 (1 constraints: 290d5a14)
 javax.transaction:jta:1.1 (1 constraints: 9f07d96b)
-javax.validation:validation-api:1.1.0.Final (1 constraints: 13133130)
-javax.ws.rs:javax.ws.rs-api:2.0.1 (5 constraints: 6e649355)
+javax.transaction:transaction-api:1.1 (1 constraints: 0a0b64c9)
 javax.xml.bind:jaxb-api:2.2.11 (6 constraints: a069fd48)
-javolution:javolution:5.5.1 (2 constraints: 2b1b2b82)
+javolution:javolution:5.5.1 (1 constraints: 3c0d8020)
 jline:jline:2.12 (3 constraints: 7c21b2cb)
-joda-time:joda-time:2.9.9 (4 constraints: 2326d336)
-log4j:apache-log4j-extras:1.2.17 (1 constraints: 200e1d51)
-log4j:log4j:1.2.17 (8 constraints: e7772b11)
-net.hydromatic:eigenbase-properties:1.1.5 (1 constraints: 5f0daf2c)
+joda-time:joda-time:2.10.5 (4 constraints: 4e26125d)
+log4j:log4j:1.2.17 (8 constraints: e9775f11)
 net.java.dev.jets3t:jets3t:0.9.0 (2 constraints: ec152b22)
-net.razorvine:pyrolite:4.13 (1 constraints: eb0cb829)
+net.razorvine:pyrolite:4.30 (1 constraints: eb0cc229)
 net.sf.kosmosfs:kfs:0.3 (1 constraints: fd077074)
-net.sf.opencsv:opencsv:2.3 (2 constraints: a218daa5)
-net.sf.py4j:py4j:0.10.7 (1 constraints: 490d0044)
-org.antlr:ST4:4.0.4 (3 constraints: 5521e4e4)
-org.antlr:antlr-runtime:3.5.2 (6 constraints: 7a43035f)
-org.antlr:antlr4-runtime:4.7 (1 constraints: 7a0e125f)
+net.sf.opencsv:opencsv:2.3 (1 constraints: 170b02ce)
+net.sf.py4j:py4j:0.10.8.1 (1 constraints: aa0d2f5f)
+org.antlr:ST4:4.0.4 (2 constraints: 69130686)
+org.antlr:antlr-runtime:3.5.2 (4 constraints: 31260d06)
+org.antlr:antlr4-runtime:4.7.1 (1 constraints: da0e9d7c)
 org.apache.ant:ant:1.9.1 (3 constraints: 262660e7)
 org.apache.ant:ant-launcher:1.9.1 (1 constraints: 69082485)
-org.apache.arrow:arrow-format:0.14.1 (1 constraints: 240df421)
-org.apache.arrow:arrow-memory:0.14.1 (1 constraints: 240df421)
-org.apache.arrow:arrow-vector:0.14.1 (2 constraints: 2012a545)
+org.apache.arrow:arrow-format:0.15.1 (1 constraints: 250df721)
+org.apache.arrow:arrow-memory:0.15.1 (1 constraints: 250df721)
+org.apache.arrow:arrow-vector:0.15.1 (2 constraints: 3c14a8b6)
 org.apache.avro:avro:1.9.2 (4 constraints: 3e2e68f4)
 org.apache.avro:avro-ipc:1.8.2 (1 constraints: f90b5bf4)
-org.apache.avro:avro-mapred:1.8.2 (2 constraints: 3a1a4787)
-org.apache.calcite:calcite-avatica:1.2.0-incubating (3 constraints: 4b35b263)
-org.apache.calcite:calcite-core:1.2.0-incubating (1 constraints: 68119fdf)
-org.apache.calcite:calcite-linq4j:1.2.0-incubating (1 constraints: ac1147d8)
-org.apache.commons:commons-compress:1.19 (6 constraints: 464a0c7f)
-org.apache.commons:commons-crypto:1.0.0 (2 constraints: 3a1e5fbf)
-org.apache.commons:commons-lang3:3.9 (5 constraints: 503b94b4)
-org.apache.commons:commons-math3:3.4.1 (2 constraints: a11af290)
+org.apache.avro:avro-mapred:1.8.2 (2 constraints: 3c1a8487)
+org.apache.commons:commons-compress:1.19 (5 constraints: 5c3ce090)
+org.apache.commons:commons-crypto:1.0.0 (2 constraints: 3c1ea6bf)
+org.apache.commons:commons-lang3:3.9 (7 constraints: 5556c9b7)
+org.apache.commons:commons-math3:3.4.1 (2 constraints: a21afc90)
+org.apache.commons:commons-text:1.6 (1 constraints: bb0cd11c)
+org.apache.curator:apache-curator:2.7.1 (1 constraints: 0c0bf8d6)
 org.apache.curator:curator-client:2.7.1 (2 constraints: 6a1d2734)
 org.apache.curator:curator-framework:2.7.1 (4 constraints: 4d37382d)
-org.apache.curator:curator-recipes:2.7.1 (2 constraints: a61acc91)
-org.apache.derby:derby:10.12.1.1 (3 constraints: 9f2cb182)
+org.apache.curator:curator-recipes:2.7.1 (2 constraints: a91ada91)
+org.apache.derby:derby:10.12.1.1 (2 constraints: cb1b0c38)
 org.apache.directory.api:api-asn1-api:1.0.0-M20 (1 constraints: 3d163b13)
 org.apache.directory.api:api-util:1.0.0-M20 (1 constraints: 3d163b13)
 org.apache.directory.server:apacheds-i18n:2.0.0-M15 (1 constraints: 42164713)
 org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 (1 constraints: 8f0d3b45)
-org.apache.hadoop:hadoop-annotations:2.7.3 (16 constraints: 2c27b38c)
-org.apache.hadoop:hadoop-auth:2.7.3 (1 constraints: 900d4d2f)
-org.apache.hadoop:hadoop-client:2.7.3 (2 constraints: 2b12043c)
-org.apache.hadoop:hadoop-common:2.7.3 (4 constraints: 163dee6b)
-org.apache.hadoop:hadoop-hdfs:2.7.3 (4 constraints: b834c025)
-org.apache.hadoop:hadoop-mapreduce-client-app:2.7.3 (3 constraints: ab2f8436)
-org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 (4 constraints: 184f4f66)
-org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (4 constraints: 66361812)
-org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.3 (2 constraints: 3b1dfa13)
-org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.3 (2 constraints: 2628c449)
-org.apache.hadoop:hadoop-yarn-api:2.7.3 (10 constraints: 07b8bd4c)
-org.apache.hadoop:hadoop-yarn-client:2.7.3 (1 constraints: 1f14626e)
-org.apache.hadoop:hadoop-yarn-common:2.7.3 (9 constraints: b3b2f06f)
-org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.7.3 (1 constraints: f5157dcf)
-org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (7 constraints: 5192cac0)
-org.apache.hadoop:hadoop-yarn-server-nodemanager:2.7.3 (2 constraints: 6726468d)
-org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.7.3 (2 constraints: b22045af)
-org.apache.hadoop:hadoop-yarn-server-web-proxy:2.7.3 (2 constraints: cb287679)
-org.apache.hive:hive-common:2.3.6 (1 constraints: 7b0bc2e4)
-org.apache.hive:hive-metastore:2.3.6 (1 constraints: 0d050436)
-org.apache.hive:hive-serde:2.3.6 (1 constraints: 3c0d7020)
-org.apache.hive:hive-service-rpc:2.3.6 (1 constraints: 7b0bc2e4)
-org.apache.hive:hive-shims:2.3.6 (4 constraints: b22fbcd9)
-org.apache.hive:hive-storage-api:2.4.0 (1 constraints: ec0b19f3)
-org.apache.hive.shims:hive-shims-0.23:2.3.6 (1 constraints: 8c0b6ce5)
-org.apache.hive.shims:hive-shims-common:2.3.6 (3 constraints: 222cfaad)
-org.apache.hive.shims:hive-shims-scheduler:2.3.6 (1 constraints: 8c0b6ce5)
+org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.1.1 (1 constraints: f90fda99)
+org.apache.geronimo.specs:geronimo-jaspic_1.0_spec:1.0 (1 constraints: 990f187a)
+org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1 (1 constraints: f90fda99)
+org.apache.hadoop:hadoop-annotations:2.7.4 (16 constraints: 3c2741a6)
+org.apache.hadoop:hadoop-auth:2.7.4 (1 constraints: 910d4e2f)
+org.apache.hadoop:hadoop-client:2.7.4 (2 constraints: 2c12103c)
+org.apache.hadoop:hadoop-common:2.7.4 (4 constraints: 183d1d6c)
+org.apache.hadoop:hadoop-hdfs:2.7.4 (4 constraints: bb345226)
+org.apache.hadoop:hadoop-mapreduce-client-app:2.7.4 (3 constraints: ae2f1637)
+org.apache.hadoop:hadoop-mapreduce-client-common:2.7.4 (4 constraints: 1c4fae67)
+org.apache.hadoop:hadoop-mapreduce-client-core:2.7.4 (4 constraints: 6936ae12)
+org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.4 (2 constraints: 3d1d2914)
+org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.4 (2 constraints: 2828024a)
+org.apache.hadoop:hadoop-yarn-api:2.7.4 (10 constraints: 11b87d56)
+org.apache.hadoop:hadoop-yarn-client:2.7.4 (1 constraints: 2014636e)
+org.apache.hadoop:hadoop-yarn-common:2.7.4 (9 constraints: bcb2d777)
+org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.7.4 (1 constraints: f6157ecf)
+org.apache.hadoop:hadoop-yarn-server-common:2.7.4 (7 constraints: 589281c5)
+org.apache.hadoop:hadoop-yarn-server-nodemanager:2.7.4 (2 constraints: 69267b8d)
+org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.7.4 (2 constraints: b32074af)
+org.apache.hadoop:hadoop-yarn-server-web-proxy:2.7.4 (2 constraints: cd28b579)
+org.apache.hive:hive-common:2.3.7 (2 constraints: 9b189df2)
+org.apache.hive:hive-exec:2.3.7 (2 constraints: 2d12323c)
+org.apache.hive:hive-llap-client:2.3.6 (1 constraints: 200d0937)
+org.apache.hive:hive-llap-common:2.3.6 (1 constraints: 200d0937)
+org.apache.hive:hive-metastore:2.3.7 (2 constraints: 2d12323c)
+org.apache.hive:hive-serde:2.3.7 (2 constraints: 5c1a3476)
+org.apache.hive:hive-service-rpc:2.3.7 (1 constraints: 7c0bc3e4)
+org.apache.hive:hive-shims:2.3.7 (5 constraints: d53c17b6)
+org.apache.hive:hive-storage-api:2.6.0 (2 constraints: ac18bef7)
+org.apache.hive:hive-vector-code-gen:2.3.7 (1 constraints: 0e0bf2d6)
+org.apache.hive.shims:hive-shims-0.23:2.3.7 (1 constraints: 8d0b6de5)
+org.apache.hive.shims:hive-shims-common:2.3.7 (3 constraints: 252c91ae)
+org.apache.hive.shims:hive-shims-scheduler:2.3.7 (1 constraints: 8d0b6de5)
 org.apache.htrace:htrace-core:3.1.0-incubating (2 constraints: cd22cffa)
-org.apache.httpcomponents:httpclient:4.5.6 (4 constraints: 573134dd)
+org.apache.httpcomponents:httpclient:4.5.6 (4 constraints: 5e316add)
 org.apache.httpcomponents:httpcore:4.4.10 (3 constraints: d327f763)
-org.apache.ivy:ivy:2.4.0 (3 constraints: 0826dbf1)
-org.apache.orc:orc-core:1.6.2 (3 constraints: ba1d17ad)
-org.apache.orc:orc-mapreduce:1.6.2 (1 constraints: c30cc227)
+org.apache.ivy:ivy:2.4.0 (2 constraints: 1f18fdd1)
+org.apache.logging.log4j:log4j-1.2-api:2.6.2 (1 constraints: f00b21f3)
+org.apache.logging.log4j:log4j-api:2.6.2 (4 constraints: 2e3c9f23)
+org.apache.logging.log4j:log4j-core:2.6.2 (2 constraints: fd1c2464)
+org.apache.logging.log4j:log4j-slf4j-impl:2.6.2 (2 constraints: 821cbce5)
+org.apache.logging.log4j:log4j-web:2.6.2 (1 constraints: f00b21f3)
+org.apache.orc:orc-core:1.6.2 (3 constraints: be1d24ad)
+org.apache.orc:orc-mapreduce:1.6.2 (1 constraints: c70ccf27)
 org.apache.orc:orc-shims:1.6.2 (1 constraints: 3f0aeabc)
 org.apache.parquet:parquet-avro:1.11.0 (1 constraints: 35052c3b)
-org.apache.parquet:parquet-column:1.11.0 (3 constraints: 9429f2ca)
+org.apache.parquet:parquet-column:1.11.0 (3 constraints: 9529fdca)
 org.apache.parquet:parquet-common:1.11.0 (2 constraints: 4c1e7785)
 org.apache.parquet:parquet-encoding:1.11.0 (1 constraints: ca0efb64)
 org.apache.parquet:parquet-format-structures:1.11.0 (3 constraints: 6e2bc836)
-org.apache.parquet:parquet-hadoop:1.11.0 (2 constraints: de1ac7b3)
+org.apache.parquet:parquet-hadoop:1.11.0 (2 constraints: df1ad2b3)
+org.apache.parquet:parquet-hadoop-bundle:1.8.1 (1 constraints: 7a0bc7e4)
 org.apache.parquet:parquet-jackson:1.11.0 (1 constraints: b70ee963)
 org.apache.pig:pig:0.14.0 (1 constraints: 37052f3b)
-org.apache.spark:spark-avro_2.11:2.4.5 (1 constraints: 0d050636)
-org.apache.spark:spark-catalyst_2.11:2.4.5 (1 constraints: c30cc427)
-org.apache.spark:spark-core_2.11:2.4.5 (3 constraints: b828699a)
-org.apache.spark:spark-hive_2.11:2.4.5 (1 constraints: 0d050636)
-org.apache.spark:spark-kvstore_2.11:2.4.5 (1 constraints: 1c0dcd36)
-org.apache.spark:spark-launcher_2.11:2.4.5 (1 constraints: 1c0dcd36)
-org.apache.spark:spark-network-common_2.11:2.4.5 (2 constraints: b21e24e3)
-org.apache.spark:spark-network-shuffle_2.11:2.4.5 (1 constraints: 1c0dcd36)
-org.apache.spark:spark-sketch_2.11:2.4.5 (2 constraints: 9a1bfef5)
-org.apache.spark:spark-sql_2.11:2.4.5 (1 constraints: 1f0d0137)
-org.apache.spark:spark-tags_2.11:2.4.5 (8 constraints: 0b6f59a2)
-org.apache.spark:spark-unsafe_2.11:2.4.5 (2 constraints: f31bed13)
-org.apache.thrift:libfb303:0.9.3 (3 constraints: 27289d07)
-org.apache.thrift:libthrift:0.9.3 (6 constraints: 3f4f0635)
-org.apache.xbean:xbean-asm6-shaded:4.8 (2 constraints: 2419a30f)
-org.apache.yetus:audience-annotations:0.11.0 (1 constraints: c40eb364)
-org.apache.zookeeper:zookeeper:3.4.6 (11 constraints: 18a71f48)
+org.apache.spark:spark-avro_2.12:3.0.0-preview2 (1 constraints: 6608f973)
+org.apache.spark:spark-catalyst_2.12:3.0.0-preview2 (1 constraints: 1d1030ab)
+org.apache.spark:spark-core_2.12:3.0.0-preview2 (3 constraints: c63225ac)
+org.apache.spark:spark-hive_2.12:3.0.0-preview2 (1 constraints: 6608f973)
+org.apache.spark:spark-kvstore_2.12:3.0.0-preview2 (1 constraints: 76105abd)
+org.apache.spark:spark-launcher_2.12:3.0.0-preview2 (1 constraints: 76105abd)
+org.apache.spark:spark-network-common_2.12:3.0.0-preview2 (2 constraints: 6625235b)
+org.apache.spark:spark-network-shuffle_2.12:3.0.0-preview2 (1 constraints: 76105abd)
+org.apache.spark:spark-sketch_2.12:3.0.0-preview2 (2 constraints: 4e228939)
+org.apache.spark:spark-sql_2.12:3.0.0-preview2 (1 constraints: 7910a9bd)
+org.apache.spark:spark-tags_2.12:3.0.0-preview2 (8 constraints: db8979b5)
+org.apache.spark:spark-unsafe_2.12:3.0.0-preview2 (2 constraints: a722e45d)
+org.apache.thrift:libfb303:0.9.3 (3 constraints: 2828a707)
+org.apache.thrift:libthrift:0.12.0 (6 constraints: 674fd17e)
+org.apache.velocity:velocity:1.5 (1 constraints: c70e875e)
+org.apache.xbean:xbean-asm7-shaded:4.15 (2 constraints: 82190f3d)
+org.apache.yetus:audience-annotations:0.11.0 (2 constraints: 481cabcc)
+org.apache.zookeeper:zookeeper:3.4.14 (11 constraints: 48a76cef)
 org.checkerframework:checker-qual:2.8.1 (2 constraints: 1a1a3944)
-org.codehaus.jackson:jackson-core-asl:1.9.13 (11 constraints: 8091cd06)
+org.codehaus.groovy:groovy-all:2.4.4 (1 constraints: 0c0bf2d6)
+org.codehaus.jackson:jackson-core-asl:1.9.13 (10 constraints: 908389b0)
 org.codehaus.jackson:jackson-jaxrs:1.9.13 (2 constraints: 821bca9d)
-org.codehaus.jackson:jackson-mapper-asl:1.9.13 (11 constraints: e18d325f)
+org.codehaus.jackson:jackson-mapper-asl:1.9.13 (10 constraints: f27fd49d)
 org.codehaus.jackson:jackson-xc:1.9.13 (2 constraints: 821bca9d)
-org.codehaus.janino:commons-compiler:3.0.9 (2 constraints: a41a546f)
-org.codehaus.janino:janino:3.0.9 (1 constraints: d90e817c)
+org.codehaus.janino:commons-compiler:3.0.15 (2 constraints: ff1a9e9f)
+org.codehaus.janino:janino:3.0.15 (1 constraints: 070f8a8b)
 org.codehaus.jettison:jettison:1.1 (4 constraints: a84e24a9)
 org.codehaus.mojo:animal-sniffer-annotations:1.17 (1 constraints: ed09d8aa)
-org.datanucleus:datanucleus-api-jdo:4.2.4 (2 constraints: 591df91b)
-org.datanucleus:datanucleus-core:4.1.17 (5 constraints: 584455e8)
-org.datanucleus:datanucleus-rdbms:4.1.19 (2 constraints: 911dec32)
+org.datanucleus:datanucleus-api-jdo:4.2.4 (1 constraints: 3b0d7520)
+org.datanucleus:datanucleus-core:4.1.17 (3 constraints: fd258d22)
+org.datanucleus:datanucleus-rdbms:4.1.19 (1 constraints: 700ddf2d)
 org.datanucleus:javax.jdo:3.2.0-m3 (1 constraints: 030ea249)
-org.fusesource.leveldbjni:leveldbjni-all:1.8 (9 constraints: 91a69ae7)
-org.glassfish.hk2:hk2-api:2.4.0-b34 (5 constraints: 9d5608c7)
-org.glassfish.hk2:hk2-locator:2.4.0-b34 (4 constraints: 3d490865)
-org.glassfish.hk2:hk2-utils:2.4.0-b34 (2 constraints: 0719352b)
-org.glassfish.hk2:osgi-resource-locator:1.0.1 (2 constraints: 79234465)
-org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34 (2 constraints: 0719352b)
-org.glassfish.hk2.external:javax.inject:2.4.0-b34 (6 constraints: 52712a15)
-org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2 (1 constraints: 231118d4)
-org.glassfish.jersey.containers:jersey-container-servlet:2.22.2 (1 constraints: 490d1144)
-org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2 (2 constraints: 6425a010)
-org.glassfish.jersey.core:jersey-client:2.22.2 (2 constraints: 791ef7a3)
-org.glassfish.jersey.core:jersey-common:2.22.2 (6 constraints: 5f747f50)
-org.glassfish.jersey.core:jersey-server:2.22.2 (3 constraints: 553f5d56)
-org.glassfish.jersey.media:jersey-media-jaxb:2.22.2 (1 constraints: 3111f1d4)
-org.iq80.snappy:snappy:0.2 (1 constraints: 890d5927)
-org.javassist:javassist:3.18.1-GA (1 constraints: 570d4740)
+org.eclipse.jetty.aggregate:jetty-all:7.6.0.v20120127 (1 constraints: 260ea577)
+org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016 (1 constraints: dd0e53b1)
+org.fusesource.leveldbjni:leveldbjni-all:1.8 (9 constraints: 93a6dbe7)
+org.glassfish.hk2:hk2-api:2.6.1 (1 constraints: 6e0c620c)
+org.glassfish.hk2:hk2-locator:2.6.1 (1 constraints: 4410e0ad)
+org.glassfish.hk2:hk2-utils:2.6.1 (2 constraints: 21173277)
+org.glassfish.hk2:osgi-resource-locator:1.0.3 (2 constraints: 7d23b265)
+org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 (2 constraints: 21173277)
+org.glassfish.hk2.external:jakarta.inject:2.6.1 (8 constraints: fd81450c)
+org.glassfish.jersey.containers:jersey-container-servlet:2.29.1 (1 constraints: 500d3044)
+org.glassfish.jersey.containers:jersey-container-servlet-core:2.29.1 (2 constraints: 7125a112)
+org.glassfish.jersey.core:jersey-client:2.29.1 (2 constraints: 861e81a5)
+org.glassfish.jersey.core:jersey-common:2.29.1 (7 constraints: fc846bf1)
+org.glassfish.jersey.core:jersey-server:2.29.1 (3 constraints: 683f0d5c)
+org.glassfish.jersey.inject:jersey-hk2:2.29.1 (1 constraints: 500d3044)
+org.glassfish.jersey.media:jersey-media-jaxb:2.29.1 (1 constraints: 371105d5)
+org.javassist:javassist:3.22.0-CR2 (1 constraints: 900dbf4d)
 org.jetbrains:annotations:17.0.0 (1 constraints: 6e0a64c7)
-org.jodd:jodd-core:3.5.2 (2 constraints: 0c1bda93)
-org.json4s:json4s-ast_2.11:3.5.3 (1 constraints: 0c0b9ae9)
-org.json4s:json4s-core_2.11:3.5.3 (1 constraints: 4c0c5316)
-org.json4s:json4s-jackson_2.11:3.5.3 (1 constraints: 1c0dd336)
-org.json4s:json4s-scalap_2.11:3.5.3 (1 constraints: 0c0b9ae9)
-org.lz4:lz4-java:1.4.0 (1 constraints: 160dc336)
+org.jodd:jodd-core:3.5.2 (1 constraints: 1f0d1037)
+org.json4s:json4s-ast_2.12:3.6.6 (1 constraints: 110baae9)
+org.json4s:json4s-core_2.12:3.6.6 (1 constraints: 510c6316)
+org.json4s:json4s-jackson_2.12:3.6.6 (1 constraints: 210de336)
+org.json4s:json4s-scalap_2.12:3.6.6 (1 constraints: 110baae9)
+org.lz4:lz4-java:1.7.0 (1 constraints: 1a0dd636)
 org.objenesis:objenesis:2.5.1 (2 constraints: 19198bcb)
-org.roaringbitmap:RoaringBitmap:0.7.45 (1 constraints: 510d1c44)
+org.roaringbitmap:RoaringBitmap:0.7.45 (1 constraints: 520d2744)
 org.roaringbitmap:shims:0.7.45 (1 constraints: 260eb249)
-org.scala-lang:scala-library:2.11.12 (11 constraints: 5c9bfe44)
-org.scala-lang:scala-reflect:2.11.12 (1 constraints: 340fb09a)
-org.scala-lang.modules:scala-parser-combinators_2.11:1.1.0 (1 constraints: cf0e717c)
-org.scala-lang.modules:scala-xml_2.11:1.0.6 (1 constraints: 080b84e9)
-org.slf4j:jcl-over-slf4j:1.7.16 (1 constraints: 500d1d44)
-org.slf4j:jul-to-slf4j:1.7.16 (1 constraints: 500d1d44)
-org.slf4j:slf4j-api:1.7.25 (49 constraints: f1d591ce)
+org.scala-lang:scala-library:2.12.10 (12 constraints: f7aba36d)
+org.scala-lang:scala-reflect:2.12.10 (2 constraints: ab1c0b7a)
+org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2 (1 constraints: d20e7d7c)
+org.scala-lang.modules:scala-xml_2.12:1.2.0 (1 constraints: 150dc736)
+org.slf4j:jcl-over-slf4j:1.7.16 (1 constraints: 510d2844)
+org.slf4j:jul-to-slf4j:1.7.16 (1 constraints: 510d2844)
+org.slf4j:slf4j-api:1.7.28 (53 constraints: 6e0e984b)
 org.sonatype.sisu.inject:cglib:2.2.1-v20090111 (1 constraints: aa0cfd36)
-org.spark-project.hive:hive-exec:1.2.1.spark2 (1 constraints: 990fa09c)
-org.spark-project.hive:hive-metastore:1.2.1.spark2 (1 constraints: 990fa09c)
-org.spark-project.spark:unused:1.0.0 (12 constraints: 9aab75cf)
-org.xerial.snappy:snappy-java:1.1.7.3 (2 constraints: 681c5e46)
-oro:oro:2.0.8 (3 constraints: 3b229337)
-stax:stax-api:1.0.1 (2 constraints: ea186edd)
+org.spark-project.spark:unused:1.0.0 (12 constraints: a6ab49db)
+org.xerial.snappy:snappy-java:1.1.7.3 (2 constraints: 691c6a46)
+oro:oro:2.0.8 (3 constraints: 3c22c237)
+stax:stax-api:1.0.1 (1 constraints: 040bded6)
 tomcat:jasper-compiler:5.5.23 (2 constraints: 93169c60)
 tomcat:jasper-runtime:5.5.23 (2 constraints: 93169c60)
 xerces:xercesImpl:2.9.1 (1 constraints: ac0ccc0f)
@@ -237,14 +254,9 @@ xmlenc:xmlenc:0.52 (3 constraints: 05228b2f)
 
 [Test dependencies]
 junit:junit:4.12 (1 constraints: db04ff30)
-org.apache.curator:apache-curator:2.7.1 (1 constraints: 0c0bf8d6)
-org.apache.hadoop:hadoop-mapreduce-client-hs:2.7.3 (1 constraints: b60fac84)
-org.apache.hadoop:hadoop-minicluster:2.7.3 (1 constraints: 0e050d36)
-org.apache.hadoop:hadoop-yarn-server-tests:2.7.3 (1 constraints: b60fac84)
-org.apache.hive:hive-exec:2.3.6 (1 constraints: 0d050436)
-org.apache.hive:hive-vector-code-gen:2.3.6 (1 constraints: 0d0bf1d6)
-org.apache.velocity:velocity:1.5 (1 constraints: c70e875e)
-org.codehaus.groovy:groovy-all:2.4.4 (1 constraints: 0c0bf2d6)
+org.apache.hadoop:hadoop-mapreduce-client-hs:2.7.4 (1 constraints: b70fad84)
+org.apache.hadoop:hadoop-minicluster:2.7.4 (1 constraints: 0e050d36)
+org.apache.hadoop:hadoop-yarn-server-tests:2.7.4 (1 constraints: b70fad84)
 org.hamcrest:hamcrest-core:1.3 (2 constraints: 7910aeb0)
 org.mockito:mockito-core:1.10.19 (1 constraints: 6e059840)
 org.slf4j:slf4j-simple:1.7.5 (1 constraints: 0f050a36)
diff --git a/versions.props b/versions.props
index 0a1f86f530a9..81bd1c28298e 100644
--- a/versions.props
+++ b/versions.props
@@ -2,11 +2,11 @@ org.slf4j:slf4j-api = 1.7.22
 com.google.guava:guava = 28.0-jre
 org.apache.avro:avro = 1.9.2
 org.apache.hadoop:* = 2.7.3
-org.apache.hive:hive-metastore = 2.3.6
+org.apache.hive:hive-metastore = 2.3.7
 org.apache.orc:* = 1.6.2
 org.apache.parquet:parquet-avro = 1.11.0
-org.apache.spark:spark-hive_2.11 = 2.4.5
-org.apache.spark:spark-avro_2.11 = 2.4.5
+org.apache.spark:spark-hive_2.12 = 3.0.0-preview2
+org.apache.spark:spark-avro_2.12 = 3.0.0-preview2
 org.apache.pig:pig = 0.14.0
 org.apache.commons:commons-lang3 = 3.9
 com.fasterxml.jackson.*:* = 2.10.0
@@ -18,5 +18,5 @@ junit:junit = 4.12
 org.slf4j:slf4j-simple = 1.7.5
 org.mockito:mockito-core = 1.10.19
 joda-time:joda-time = 2.9.9
-org.apache.hive:hive-exec = 2.3.6
-org.apache.hive:hive-metastore = 2.3.6
+org.apache.hive:hive-exec = 2.3.7
+org.apache.hive:hive-metastore = 2.3.7