diff --git a/server/build.gradle b/server/build.gradle
index c71cc4c7dbd..deb38398979 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -106,7 +106,7 @@ dependencies {
   compile 'com.carrotsearch:hppc:0.7.1'
 
   // time handling, remove with java 8 time
-  compile 'joda-time:joda-time:2.9.9'
+  compile 'joda-time:joda-time:2.10'
 
   // percentiles aggregation
   compile 'com.tdunning:t-digest:3.2'
diff --git a/server/licenses/joda-time-2.10.jar.sha1 b/server/licenses/joda-time-2.10.jar.sha1
new file mode 100644
index 00000000000..a597eabc654
--- /dev/null
+++ b/server/licenses/joda-time-2.10.jar.sha1
@@ -0,0 +1 @@
+f66c8125d1057ffce6c4e29e624cac863e110e2b
\ No newline at end of file
diff --git a/server/licenses/joda-time-2.9.9.jar.sha1 b/server/licenses/joda-time-2.9.9.jar.sha1
deleted file mode 100644
index 4009932ea3b..00000000000
--- a/server/licenses/joda-time-2.9.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7b520c458572890807d143670c9b24f4de90897
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/build.gradle b/x-pack/plugin/sql/sql-action/build.gradle
index d8805d2e3db..f6b5177d508 100644
--- a/x-pack/plugin/sql/sql-action/build.gradle
+++ b/x-pack/plugin/sql/sql-action/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     }
     compile xpackProject('plugin:sql:sql-proto')
     compile "org.apache.lucene:lucene-core:${versions.lucene}"
-    compile 'joda-time:joda-time:2.9.9'
+    compile 'joda-time:joda-time:2.10'
     runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
     runtime "org.apache.logging.log4j:log4j-api:${versions.log4j}"
     runtime "org.apache.logging.log4j:log4j-core:${versions.log4j}"
diff --git a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1
new file mode 100644
index 00000000000..a597eabc654
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1
@@ -0,0 +1 @@
+f66c8125d1057ffce6c4e29e624cac863e110e2b
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1
deleted file mode 100644
index 4009932ea3b..00000000000
--- a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7b520c458572890807d143670c9b24f4de90897
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-proto/build.gradle b/x-pack/plugin/sql/sql-proto/build.gradle
index 5a1439f4360..7f26176e3c7 100644
--- a/x-pack/plugin/sql/sql-proto/build.gradle
+++ b/x-pack/plugin/sql/sql-proto/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     compile (project(':libs:x-content')) {
         transitive = false
     }
-    compile 'joda-time:joda-time:2.9.9'
+    compile 'joda-time:joda-time:2.10'
     runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
 
     testCompile "org.elasticsearch.test:framework:${version}"
diff --git a/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1
new file mode 100644
index 00000000000..a597eabc654
--- /dev/null
+++ b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1
@@ -0,0 +1 @@
+f66c8125d1057ffce6c4e29e624cac863e110e2b
\ No newline at end of file
diff --git a/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1
deleted file mode 100644
index 4009932ea3b..00000000000
--- a/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f7b520c458572890807d143670c9b24f4de90897
\ No newline at end of file