diff --git a/pom.xml b/pom.xml
index dc4d865..1a3564f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>io.prestosql.hive</groupId>
     <artifactId>hive-apache</artifactId>
-    <version>3.0.0-7-SNAPSHOT</version>
+    <version>3.1.2-1-SNAPSHOT</version>
 
     <name>hive-apache</name>
     <description>Shaded version of Apache Hive for Presto</description>
@@ -43,13 +43,12 @@
 
         <shadeBase>io.prestosql.hive.\$internal</shadeBase>
 
-        <dep.hive.version>3.0.0</dep.hive.version>
+        <dep.hive.version>3.1.2</dep.hive.version>
 
         <dep.avro.version>1.8.2</dep.avro.version>
-        <dep.jodd.version>3.5.2</dep.jodd.version>
         <dep.parquet.version>1.11.0</dep.parquet.version>
         <dep.protobuf.version>2.5.0</dep.protobuf.version>
-        <dep.slf4j.version>1.7.25</dep.slf4j.version>
+        <dep.slf4j.version>1.7.29</dep.slf4j.version>
     </properties>
 
     <dependencies>
@@ -287,10 +286,6 @@
                     <groupId>org.apache.ivy</groupId>
                     <artifactId>ivy</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-httpclient</groupId>
-                    <artifactId>commons-httpclient</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>commons-io</groupId>
                     <artifactId>commons-io</artifactId>
@@ -533,12 +528,6 @@
             <version>${dep.protobuf.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jodd</groupId>
-            <artifactId>jodd-core</artifactId>
-            <version>${dep.jodd.version}</version>
-        </dependency>
-
         <!-- hadoop compilation dependency for CodecPool -->
         <dependency>
             <groupId>org.apache.hadoop</groupId>
@@ -677,10 +666,6 @@
                                     <pattern>org.tukaani.xz</pattern>
                                     <shadedPattern>${shadeBase}.org.tukaani.xz</shadedPattern>
                                 </relocation>
-                                <relocation>
-                                    <pattern>jodd</pattern>
-                                    <shadedPattern>${shadeBase}.jodd</shadedPattern>
-                                </relocation>
                                 <relocation>
                                     <pattern>com.codahale.metrics</pattern>
                                     <shadedPattern>${shadeBase}.com.codahale.metrics</shadedPattern>
@@ -725,6 +710,7 @@
                                         <exclude>hive-exec-log4j2.properties</exclude>
                                         <exclude>tez-container-log4j2.properties</exclude>
                                         <exclude>org/apache/hadoop/hive/ql/io/CodecPool*.class</exclude>
+                                        <exclude>org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTimeUtils.class</exclude>
                                         <exclude>org/apache/tez/**</exclude>
                                     </excludes>
                                 </filter>
diff --git a/src/main/java/org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTimeUtils.java b/src/main/java/org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTimeUtils.java
new file mode 100644
index 0000000..6ee2665
--- /dev/null
+++ b/src/main/java/org/apache/hadoop/hive/ql/io/parquet/timestamp/NanoTimeUtils.java
@@ -0,0 +1,24 @@
+package org.apache.hadoop.hive.ql.io.parquet.timestamp;
+
+import org.apache.hadoop.hive.common.type.Timestamp;
+
+import static java.lang.Math.toIntExact;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+public final class NanoTimeUtils
+{
+    private NanoTimeUtils() {}
+
+    private static final int JULIAN_EPOCH_OFFSET_DAYS = 2_440_588;
+
+    public static NanoTime getNanoTime(Timestamp timestamp, @SuppressWarnings("unused") boolean ignored)
+    {
+        int epochDay = toIntExact(SECONDS.toDays(timestamp.toEpochSecond()));
+        int julianDay = JULIAN_EPOCH_OFFSET_DAYS + epochDay;
+
+        long timeOfDaySeconds = timestamp.toEpochSecond() % 86400;
+        long timeOfDayNanos = SECONDS.toNanos(timeOfDaySeconds) + timestamp.getNanos();
+
+        return new NanoTime(julianDay, timeOfDayNanos);
+    }
+}
diff --git a/src/main/java/org/apache/hadoop/hive/serde2/SerDe.java b/src/main/java/org/apache/hadoop/hive/serde2/SerDe.java
deleted file mode 100644
index f45ebdb..0000000
--- a/src/main/java/org/apache/hadoop/hive/serde2/SerDe.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hive.serde2;
-
-/**
- * Legacy interface from Hive 1.x needed for DWRF
- */
-@Deprecated
-public interface SerDe
-        extends Deserializer, Serializer
-{}
diff --git a/src/main/java/org/apache/hadoop/hive/serde2/columnar/OptimizedLazyBinaryColumnarSerde.java b/src/main/java/org/apache/hadoop/hive/serde2/columnar/OptimizedLazyBinaryColumnarSerde.java
deleted file mode 100644
index d27fd53..0000000
--- a/src/main/java/org/apache/hadoop/hive/serde2/columnar/OptimizedLazyBinaryColumnarSerde.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hive.serde2.columnar;
-
-import org.apache.hadoop.hive.serde2.SerDeException;
-import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.StructField;
-import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector;
-import org.apache.hadoop.io.Writable;
-
-import java.util.List;
-
-/**
- * This is a variant of {@link LazyBinaryColumnarSerDe} that avoids a call to
- * {@code StringObjectInspector.getPrimitiveJavaObject()} in {@code serialize()}
- * to check whether the string is empty (it calls {@code getPrimitiveWritableObject()}
- * instead). This improves CPU efficiency by avoiding turning the underlying bytes into
- * a Java String.
- */
-public class OptimizedLazyBinaryColumnarSerde
-        extends LazyBinaryColumnarSerDe
-{
-    @Override
-    public Writable serialize(Object obj, ObjectInspector objInspector)
-            throws SerDeException
-    {
-        if (objInspector.getCategory() != ObjectInspector.Category.STRUCT) {
-            throw new SerDeException(getClass().toString()
-                    + " can only serialize struct types, but we got: "
-                    + objInspector.getTypeName());
-        }
-
-        StructObjectInspector soi = (StructObjectInspector) objInspector;
-        List<? extends StructField> fields = soi.getAllStructFieldRefs();
-        List<Object> list = soi.getStructFieldsDataAsList(obj);
-
-        LazyBinarySerDe.BooleanRef warnedOnceNullMapKey = new LazyBinarySerDe.BooleanRef(false);
-        serializeStream.reset();
-        serializedSize = 0;
-        int streamOffset = 0;
-        // Serialize each field
-        for (int i = 0; i < fields.size(); i++) {
-            // Get the field objectInspector and the field object.
-            ObjectInspector foi = fields.get(i).getFieldObjectInspector();
-            Object f = (list == null ? null : list.get(i));
-            //empty strings are marked by an invalid utf single byte sequence. A valid utf stream cannot
-            //produce this sequence
-            if ((f != null) && (foi.getCategory().equals(ObjectInspector.Category.PRIMITIVE))
-                    && ((PrimitiveObjectInspector) foi).getPrimitiveCategory().equals(
-                    PrimitiveObjectInspector.PrimitiveCategory.STRING)
-                    && ((StringObjectInspector) foi).getPrimitiveWritableObject(f).getLength() == 0) {
-                serializeStream.write(INVALID_UTF__SINGLE_BYTE, 0, 1);
-            }
-            else {
-                LazyBinarySerDe.serialize(serializeStream, f, foi, true, warnedOnceNullMapKey);
-            }
-            field[i].set(serializeStream.getData(), streamOffset, serializeStream.getLength() - streamOffset);
-            streamOffset = serializeStream.getLength();
-        }
-        serializedSize = serializeStream.getLength();
-        lastOperationSerialize = true;
-        lastOperationDeserialize = false;
-        return serializeCache;
-    }
-}
diff --git a/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java b/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java
index 5cb581e..71b8932 100644
--- a/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java
+++ b/src/main/java/org/apache/hive/hcatalog/data/JsonSerDe.java
@@ -21,8 +21,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.CharacterCodingException;
-import java.sql.Date;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,9 +32,11 @@
 import java.util.regex.Pattern;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hive.common.type.Date;
 import org.apache.hadoop.hive.common.type.HiveChar;
 import org.apache.hadoop.hive.common.type.HiveDecimal;
 import org.apache.hadoop.hive.common.type.HiveVarchar;
+import org.apache.hadoop.hive.common.type.Timestamp;
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.serde.serdeConstants;
 import org.apache.hadoop.hive.serde2.AbstractSerDe;