Skip to content

Commit dda8da1

Browse files
authored
Update joda dependency to latest 2.10.10 backport(#72052) (#72490)
Latest JDKs are shipping with timezone data 2021a which is also included in latest joda. In order to have the timezone information consistent in both joda and java.time joda dependnecy has to be updated closes #72028
1 parent 2447b85 commit dda8da1

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

buildSrc/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ slf4j = 1.6.2
1919
jna = 5.5.0
2020

2121
netty = 4.1.32.Final
22-
joda = 2.10.1
22+
joda = 2.10.10
2323

2424
# when updating this version, you need to ensure compatibility with:
2525
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)

server/licenses/joda-time-2.10.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
29e8126e31f41e5c12b9fe3a7eb02e704c47d70b

server/src/test/java/org/elasticsearch/common/time/DateUtilsTests.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,17 @@
3131
import static org.hamcrest.Matchers.equalTo;
3232

3333
public class DateUtilsTests extends ESTestCase {
34+
// list of ignored timezones.
35+
// These should be cleaned up when all tested jdks (oracle, adoptopenjdk, openjdk etc) have the timezone db included
36+
// see when a timezone was included in jdk version here https://www.oracle.com/java/technologies/tzdata-versions.html
3437
private static final Set<String> IGNORE = new HashSet<>(Arrays.asList(
35-
"Eire", "Europe/Dublin" // dublin timezone in joda does not account for DST
38+
"Eire", "Europe/Dublin", // dublin timezone in joda does not account for DST
39+
"Asia/Qostanay", // part of tzdata2018h
40+
"America/Godthab", // part of tzdata2020a (maps to America/Nuuk)
41+
"America/Nuuk"// part of tzdata2020a
3642
));
37-
38-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/72028")
43+
44+
3945
public void testTimezoneIds() {
4046
assertNull(DateUtils.dateTimeZoneToZoneId(null));
4147
assertNull(DateUtils.zoneIdToDateTimeZone(null));

x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
29e8126e31f41e5c12b9fe3a7eb02e704c47d70b

0 commit comments

Comments
 (0)