Update to joda time 2.10.2 (#42199)

elastic · May 20, 2019 · c72c76b · c72c76b
1 parent b4a413c
commit c72c76b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -21,7 +21,7 @@ slf4j             = 1.6.2
 jna               = 4.5.1
 
 netty             = 4.1.35.Final
-joda              = 2.10.1
+joda              = 2.10.2
 
 # when updating this version, you need to ensure compatibility with:
 #  - plugins/ingest-attachment (transitive dependency, check the upstream POM)

diff --git a/server/licenses/joda-time-2.10.1.jar.sha1 b/server/licenses/joda-time-2.10.1.jar.sha1
diff --git a/server/licenses/joda-time-2.10.2.jar.sha1 b/server/licenses/joda-time-2.10.2.jar.sha1
@@ -0,0 +1 @@
+a079fc39ccc3de02acdeb7117443e5d9bd431687
diff --git a/server/src/test/java/org/elasticsearch/common/time/DateUtilsTests.java b/server/src/test/java/org/elasticsearch/common/time/DateUtilsTests.java
@@ -45,7 +45,8 @@
 
 public class DateUtilsTests extends ESTestCase {
     private static final Set<String> IGNORE = new HashSet<>(Arrays.asList(
-        "Eire", "Europe/Dublin" // dublin timezone in joda does not account for DST
+        "Eire", "Europe/Dublin", // dublin timezone in joda does not account for DST
+        "Asia/Qostanay" // this has been added in joda 2.10.2 but is not part of the JDK 12.0.1 tzdata yet
     ));
 
     public void testTimezoneIds() {

diff --git a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1
diff --git a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.2.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.2.jar.sha1
@@ -0,0 +1 @@
+a079fc39ccc3de02acdeb7117443e5d9bd431687