Skip to content

Update Joda to 2.12.2 #19758

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
tdcmeehan merged 1 commit into from
Jun 9, 2023
Merged

Update Joda to 2.12.2 #19758

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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<dep.drift.version>1.33</dep.drift.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.joda.version>2.12.2</dep.joda.version>
<dep.tempto.version>1.53</dep.tempto.version>
<dep.testng.version>7.5</dep.testng.version>
<dep.assertj-core.version>3.8.0</dep.assertj-core.version>
Expand Down
3 changes: 3 additions & 0 deletions 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 @@ -2237,3 +2237,6 @@
2228 Europe/Saratov
2229 Asia/Qostanay
2230 America/Nuuk
2231 Pacific/Kanton
2232 Europe/Kyiv
2233 America/Ciudad_Juarez
2 changes: 1 addition & 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 @@ -216,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(), 6334606028834602490L, "zone-index.properties file contents changed!");
assertEquals(hasher.hash().asLong(), 4825838578917475630L, "zone-index.properties file contents changed!");
}

public void assertTimeZoneNotSupported(String zoneId)
Expand Down
23 changes: 0 additions & 23 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 @@ -67,29 +67,6 @@ public void testNamedZones()
continue;
}

if (zoneId.equals("Pacific/Kanton")) {
// TODO: remove Once Joda version supports this Timezone.
// JDK supported this timezone, but not Joda and was resulting in the test failure.
// https://www.joda.org/joda-time/timezones.html
continue;
}

if (zoneId.equals("Europe/Kyiv")) {
// TODO: remove Once this recently renamed Timezone is supported.
// Europe/Kiev was renamed to Europe/Kyiv.
// https://www.oracle.com/java/technologies/tzdata-versions.html
// Likely need to wait for Joda to supported this renamed timezone.
// https://www.joda.org/joda-time/timezones.html
continue;
}

if (zoneId.equals("America/Ciudad_Juarez")) {
// TODO: remove Once this new Timezone is supported.
// This is included in 2022g release of the tz code and data.
// https://mm.icann.org/pipermail/tz-announce/2022-November/000076.html
continue;
}

DateTimeZone dateTimeZone = DateTimeZone.forID(zoneId);
DateTimeZone indexedZone = getDateTimeZone(TimeZoneKey.getTimeZoneKey(zoneId));

Expand Down