Upgrade joda-time to 2.9.4

This commit upgrades joda-time to version 2.9.4 to integrate a bug fix
there into Elasticsearch.

Relates #18609
This commit is contained in:
Jason Tedor 2016-05-27 08:51:19 -04:00
parent 1a298c2e6f
commit 41710f1028
4 changed files with 2 additions and 8 deletions

View File

@ -63,7 +63,7 @@ dependencies {
compile 'com.carrotsearch:hppc:0.7.1'
// time handling, remove with java 8 time
compile 'joda-time:joda-time:2.8.2'
compile 'joda-time:joda-time:2.9.4'
// joda 2.0 moved to using volatile fields for datetime
// When updating to a new version, make sure to update our copy of BaseDateTime
compile 'org.joda:joda-convert:1.2'

View File

@ -1 +0,0 @@
d27c24204c5e507b16fec01006b3d0f1ec42aed4

View File

@ -0,0 +1 @@
1c295b462f16702ebe720bbb08f62e1ba80da41b

View File

@ -44,12 +44,6 @@ public class GroovySecurityTests extends ESTestCase {
private GroovyScriptEngineService se;
static {
// ensure we load all the timezones in the parent classloader with all permissions
// relates to https://github.com/elastic/elasticsearch/issues/14524
org.joda.time.DateTimeZone.getDefault();
}
@Override
public void setUp() throws Exception {
super.setUp();