diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index e792cfa3378ff..c1d759a5d1c28 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -16,6 +16,7 @@ slf4j             = 1.6.2
 jna               = 4.5.1
 
 netty             = 4.1.30.Final
+joda              = 2.10.1
 
 # test dependencies
 randomizedrunner  = 2.7.0
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
index 510c101379d2f..d35a248f5a5e5 100644
--- a/plugins/repository-gcs/build.gradle
+++ b/plugins/repository-gcs/build.gradle
@@ -26,7 +26,7 @@ dependencies {
   compile 'com.google.cloud:google-cloud-storage:1.40.0'
   compile 'com.google.cloud:google-cloud-core:1.40.0'
   compile 'com.google.guava:guava:20.0'
-  compile 'joda-time:joda-time:2.10'
+  compile "joda-time:joda-time:${versions.joda}"
   compile 'com.google.http-client:google-http-client:1.24.1'
   compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
   compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
index 5c57c9208c536..3e6c7a1318df3 100644
--- a/plugins/repository-s3/build.gradle
+++ b/plugins/repository-s3/build.gradle
@@ -49,7 +49,7 @@ dependencies {
   compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1'
   compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0'
   compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
-  compile 'joda-time:joda-time:2.10'
+  compile "joda-time:joda-time:${versions.joda}"
 
   // HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
   // and whitelist this hack in JarHell 
diff --git a/server/build.gradle b/server/build.gradle
index 412e067782782..1b507e542c45a 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -103,7 +103,7 @@ dependencies {
   compile 'com.carrotsearch:hppc:0.7.1'
 
   // time handling, remove with java 8 time
-  compile 'joda-time:joda-time:2.10'
+  compile "joda-time:joda-time:${versions.joda}"
 
   // percentiles aggregation
   compile 'com.tdunning:t-digest:3.2'
diff --git a/server/licenses/joda-time-2.10.1.jar.sha1 b/server/licenses/joda-time-2.10.1.jar.sha1
new file mode 100644
index 0000000000000..75e809754ecee
--- /dev/null
+++ b/server/licenses/joda-time-2.10.1.jar.sha1
@@ -0,0 +1 @@
+9ac3dbf89dbf2ee385185dd0cd3064fe789efee0
\ No newline at end of file
diff --git a/server/licenses/joda-time-2.10.jar.sha1 b/server/licenses/joda-time-2.10.jar.sha1
deleted file mode 100644
index a597eabc654bf..0000000000000
--- a/server/licenses/joda-time-2.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f66c8125d1057ffce6c4e29e624cac863e110e2b
\ No newline at end of file
diff --git a/server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java b/server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java
index 2723be8699855..f188eb4cac6f4 100644
--- a/server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java
+++ b/server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java
@@ -66,7 +66,6 @@ public void testEnumIds() {
         assertEquals(SECOND_OF_MINUTE, DateTimeUnit.resolve((byte) 8));
     }
 
-    @AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/33749")
     public void testConversion() {
         long millis = randomLongBetween(0, Instant.now().toEpochMilli());
         DateTimeZone zone = randomDateTimeZone();
diff --git a/x-pack/plugin/sql/sql-action/build.gradle b/x-pack/plugin/sql/sql-action/build.gradle
index 9e53c36bbf600..9cf62723ea61e 100644
--- a/x-pack/plugin/sql/sql-action/build.gradle
+++ b/x-pack/plugin/sql/sql-action/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     }
     compile xpackProject('plugin:sql:sql-proto')
     compile "org.apache.lucene:lucene-core:${versions.lucene}"
-    compile 'joda-time:joda-time:2.10'
+    compile "joda-time:joda-time:${versions.joda}"
     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}"
@@ -138,4 +138,4 @@ thirdPartyAudit.excludes = [
         'org.zeromq.ZMQ$Context',
         'org.zeromq.ZMQ$Socket',
         'org.zeromq.ZMQ'
-]
\ No newline at end of file
+]
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
new file mode 100644
index 0000000000000..75e809754ecee
--- /dev/null
+++ b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1
@@ -0,0 +1 @@
+9ac3dbf89dbf2ee385185dd0cd3064fe789efee0
\ No newline at end of file
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
deleted file mode 100644
index a597eabc654bf..0000000000000
--- a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f66c8125d1057ffce6c4e29e624cac863e110e2b
\ 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 7d28336bfc51f..a10e3ff8c4ce1 100644
--- a/x-pack/plugin/sql/sql-proto/build.gradle
+++ b/x-pack/plugin/sql/sql-proto/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     compile (project(':libs:x-content')) {
         transitive = false
     }
-    compile 'joda-time:joda-time:2.10'
+    compile "joda-time:joda-time:${versions.joda}"
     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.1.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.1.jar.sha1
new file mode 100644
index 0000000000000..75e809754ecee
--- /dev/null
+++ b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.1.jar.sha1
@@ -0,0 +1 @@
+9ac3dbf89dbf2ee385185dd0cd3064fe789efee0
\ No newline at end of file
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
deleted file mode 100644
index a597eabc654bf..0000000000000
--- a/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f66c8125d1057ffce6c4e29e624cac863e110e2b
\ No newline at end of file