Skip to content
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

Jump to bottom

Update Joda Time and Jackson #6660

Merged
merged 2 commits into from Jan 25, 2021
Merged

Update Joda Time and Jackson #6660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6877652
Pick Joda version 2.10.9 from airbase
wendigo Jan 20, 2021
6d250da
Pick Jackson version 2.11.4 from airbase
wendigo Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/trino-main/src/test/java/io/trino/util/TestTimeZoneUtils.java
View file
Open in desktop
Expand Up @@ -43,6 +43,11 @@ public void testNamedZones()
continue;
}

// Remove when minimal Java version is raised to 11.0.10: https://github.com/trinodb/trino/issues/6662
wendigo marked this conversation as resolved.
Show resolved Hide resolved
if (zoneId.equals("US/Pacific-New")) {
continue;
}

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

Expand Down
2 changes: 1 addition & 1 deletion core/trino-spi/src/main/resources/io/trino/spi/type/zone-index.properties
View file
Open in desktop
Expand Up @@ -2180,7 +2180,7 @@
2171 US/Michigan
2172 US/Mountain
2173 US/Pacific
2174 US/Pacific-New
# 2174 US/Pacific-New # removed from tzdata since 2020b
2175 US/Samoa
2176 CET
2177 CST6CDT
Expand Down
5 changes: 4 additions & 1 deletion core/trino-spi/src/test/java/io/trino/spi/type/TestTimeZoneKey.java
View file
Open in desktop
Expand Up @@ -197,6 +197,9 @@ public void testZoneKeyIdRange()
// previous spot for MST
assertFalse(hasValue[2196]);
hasValue[2196] = true;
// previous spot for US/Pacific-New
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 @@ -215,7 +218,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(), -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
2 changes: 0 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -61,10 +61,8 @@
<dep.errorprone.version>2.5.1</dep.errorprone.version>
<dep.testcontainers.version>1.15.1</dep.testcontainers.version>
<dep.docker-java.version>3.2.7</dep.docker-java.version>
<dep.joda.version>2.10.6</dep.joda.version>
<dep.coral.version>1.0.12</dep.coral.version>
<dep.confluent.version>5.5.2</dep.confluent.version>
<dep.jackson.version>2.11.1</dep.jackson.version>

<!--
America/Bahia_Banderas has:
Expand Down