From f21e68f9b11ba801f5fa07fce174e7268806ae78 Mon Sep 17 00:00:00 2001
From: Piotr Findeisen <piotr.findeisen@gmail.com>
Date: Wed, 19 Jan 2022 12:21:25 +0100
Subject: [PATCH] Add Pacific/Kanton time zone

Recent JVM versions use tzdata v. 2021b, which includes `Pacific/Kanton`
time zone.
---
 .../src/main/resources/io/trino/spi/type/zone-index.properties  | 1 +
 .../src/test/java/io/trino/spi/type/TestTimeZoneKey.java        | 2 +-
 pom.xml                                                         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/trino-spi/src/main/resources/io/trino/spi/type/zone-index.properties b/core/trino-spi/src/main/resources/io/trino/spi/type/zone-index.properties
index d2c46f84653e..b1dfea2d12bf 100644
--- a/core/trino-spi/src/main/resources/io/trino/spi/type/zone-index.properties
+++ b/core/trino-spi/src/main/resources/io/trino/spi/type/zone-index.properties
@@ -2237,3 +2237,4 @@
 2228 Europe/Saratov
 2229 Asia/Qostanay
 2230 America/Nuuk
+2231 Pacific/Kanton
diff --git a/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java b/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java
index 747573cc5dc6..6bc2f2549031 100644
--- a/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java
+++ b/core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java
@@ -220,7 +220,7 @@ public void testZoneKeyData()
             hasher.putString(timeZoneKey.getId(), StandardCharsets.UTF_8);
         }
         // Zone file should not (normally) be changed, so let's make this more difficult
-        assertEquals(hasher.hash().asLong(), 6334606028834602490L, "zone-index.properties file contents changed!");
+        assertEquals(hasher.hash().asLong(), -2665680993684804317L, "zone-index.properties file contents changed!");
     }
 
     @Test
diff --git a/pom.xml b/pom.xml
index 4f9400a79d32..1096ee9868dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
         <dep.aws-sdk.version>1.12.85</dep.aws-sdk.version>
         <dep.okhttp.version>3.14.9</dep.okhttp.version>
+        <dep.joda.version>2.10.13</dep.joda.version>
         <dep.jsonwebtoken.version>0.11.2</dep.jsonwebtoken.version>
         <dep.oracle.version>19.3.0.0</dep.oracle.version>
         <dep.drift.version>1.14</dep.drift.version>