diff --git a/pom.xml b/pom.xml
index 2dfc20681f846..8737bc9757596 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,9 @@
3.4.0
19.3.0.0
1.32
- 2.10.6
+
+ 2.10.8
1.51
6.10
3.8.0
diff --git a/presto-common/src/main/resources/com/facebook/presto/common/type/zone-index.properties b/presto-common/src/main/resources/com/facebook/presto/common/type/zone-index.properties
index a73dadcee7b54..a613e71844c15 100644
--- a/presto-common/src/main/resources/com/facebook/presto/common/type/zone-index.properties
+++ b/presto-common/src/main/resources/com/facebook/presto/common/type/zone-index.properties
@@ -2180,7 +2180,7 @@
2171 US/Michigan
2172 US/Mountain
2173 US/Pacific
-2174 US/Pacific-New
+# 2174 US/Pacific-New removed http://mm.icann.org/pipermail/tz-announce/2020-October/000059.html
2175 US/Samoa
2176 CET
2177 CST6CDT
diff --git a/presto-common/src/test/java/com/facebook/presto/common/type/TestTimeZoneKey.java b/presto-common/src/test/java/com/facebook/presto/common/type/TestTimeZoneKey.java
index 1b7afe015722c..40d1d63fcb740 100644
--- a/presto-common/src/test/java/com/facebook/presto/common/type/TestTimeZoneKey.java
+++ b/presto-common/src/test/java/com/facebook/presto/common/type/TestTimeZoneKey.java
@@ -188,6 +188,9 @@ public void testZoneKeyIdRange()
// previous spot for MST
assertFalse(hasValue[2196]);
hasValue[2196] = true;
+ // US/Pacific-New removed http://mm.icann.org/pipermail/tz-announce/2020-October/000059.html
+ assertFalse(hasValue[2174]);
+ hasValue[2174] = true;
for (int i = 0; i < hasValue.length; i++) {
assertTrue(hasValue[i], "There is no time zone with key " + i);
@@ -213,7 +216,7 @@ public int compare(TimeZoneKey left, TimeZoneKey right)
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(), -3809591333307967388L, "zone-index.properties file contents changed!");
+ assertEquals(hasher.hash().asLong(), 6334606028834602490L, "zone-index.properties file contents changed!");
}
public void assertTimeZoneNotSupported(String zoneId)
diff --git a/presto-main/src/test/java/com/facebook/presto/util/TestTimeZoneUtils.java b/presto-main/src/test/java/com/facebook/presto/util/TestTimeZoneUtils.java
index f8711fa3ce786..84a2c2363a144 100644
--- a/presto-main/src/test/java/com/facebook/presto/util/TestTimeZoneUtils.java
+++ b/presto-main/src/test/java/com/facebook/presto/util/TestTimeZoneUtils.java
@@ -60,6 +60,13 @@ public void testNamedZones()
continue;
}
+ if (zoneId.equals("US/Pacific-New")) {
+ // TODO: Remove once minimum Java version is increased 11.0.10
+ // https://www.oracle.com/java/technologies/tzdata-versions.html
+ // http://mm.icann.org/pipermail/tz-announce/2020-October/000059.html
+ continue;
+ }
+
DateTimeZone dateTimeZone = DateTimeZone.forID(zoneId);
DateTimeZone indexedZone = getDateTimeZone(TimeZoneKey.getTimeZoneKey(zoneId));