From c72c76b5ea0dbdfe220de4ad0e623772b8de582f Mon Sep 17 00:00:00 2001
From: Alexander Reelsen <alexander@reelsen.net>
Date: Mon, 20 May 2019 10:17:08 -0400
Subject: [PATCH] Update to joda time 2.10.2 (#42199)

---
 buildSrc/version.properties                                    | 2 +-
 server/licenses/joda-time-2.10.1.jar.sha1                      | 1 -
 server/licenses/joda-time-2.10.2.jar.sha1                      | 1 +
 .../java/org/elasticsearch/common/time/DateUtilsTests.java     | 3 ++-
 .../plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1   | 1 -
 .../plugin/sql/sql-action/licenses/joda-time-2.10.2.jar.sha1   | 1 +
 6 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 server/licenses/joda-time-2.10.1.jar.sha1
 create mode 100644 server/licenses/joda-time-2.10.2.jar.sha1
 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1
 create mode 100644 x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.2.jar.sha1

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 21f4d8586e1c9..4447417e1dda4 100644
--- 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
deleted file mode 100644
index 75e809754ecee..0000000000000
--- a/server/licenses/joda-time-2.10.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ac3dbf89dbf2ee385185dd0cd3064fe789efee0
\ No newline at end of file
diff --git a/server/licenses/joda-time-2.10.2.jar.sha1 b/server/licenses/joda-time-2.10.2.jar.sha1
new file mode 100644
index 0000000000000..9cbac57161c8e
--- /dev/null
+++ b/server/licenses/joda-time-2.10.2.jar.sha1
@@ -0,0 +1 @@
+a079fc39ccc3de02acdeb7117443e5d9bd431687
\ No newline at end of file
diff --git a/server/src/test/java/org/elasticsearch/common/time/DateUtilsTests.java b/server/src/test/java/org/elasticsearch/common/time/DateUtilsTests.java
index 2b125127f66d3..4ef095da049ec 100644
--- 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
deleted file mode 100644
index 75e809754ecee..0000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9ac3dbf89dbf2ee385185dd0cd3064fe789efee0
\ No newline at end of file
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
new file mode 100644
index 0000000000000..9cbac57161c8e
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.2.jar.sha1
@@ -0,0 +1 @@
+a079fc39ccc3de02acdeb7117443e5d9bd431687
\ No newline at end of file