Skip to content

Update joda to 2.10.8 tzdata 2020d #15787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rschlussel merged 1 commit into from
Mar 9, 2021
Merged

Update joda to 2.10.8 tzdata 2020d #15787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@
<dep.jdbi3.version>3.4.0</dep.jdbi3.version>
<dep.oracle.version>19.3.0.0</dep.oracle.version>
<dep.drift.version>1.32</dep.drift.version>
<dep.joda.version>2.10.6</dep.joda.version>
<!-- Changing joda version changes tzdata which must match deployed JVM tzdata
Do not change this without also making sure it matches -->
<dep.joda.version>2.10.8</dep.joda.version>
<dep.tempto.version>1.51</dep.tempto.version>
<dep.testng.version>6.10</dep.testng.version>
<dep.assertj-core.version>3.8.0</dep.assertj-core.version>
Expand Down
2 changes: 1 addition & 1 deletion presto-common/src/main/resources/com/facebook/presto/common/type/zone-index.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion presto-common/src/test/java/com/facebook/presto/common/type/TestTimeZoneKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions presto-main/src/test/java/com/facebook/presto/util/TestTimeZoneUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down