Upgrade to Joda 2.10.1 (#35410)

This version contains a bugfix that allows us to reenable one of our muted tests
in DateTimeUnitTests.

Closes #33749
This commit is contained in:
Christoph Büscher 2018-11-12 10:02:41 +01:00 committed by GitHub
parent 6050deb6f0
commit 09cac321e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 10 additions and 10 deletions

View File

@ -16,6 +16,7 @@ slf4j = 1.6.2
jna = 4.5.1 jna = 4.5.1
netty = 4.1.30.Final netty = 4.1.30.Final
joda = 2.10.1
# test dependencies # test dependencies
randomizedrunner = 2.7.0 randomizedrunner = 2.7.0

View File

@ -26,7 +26,7 @@ dependencies {
compile 'com.google.cloud:google-cloud-storage:1.40.0' compile 'com.google.cloud:google-cloud-storage:1.40.0'
compile 'com.google.cloud:google-cloud-core:1.40.0' compile 'com.google.cloud:google-cloud-core:1.40.0'
compile 'com.google.guava:guava:20.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 'com.google.http-client:google-http-client:1.24.1'
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}" compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}" compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"

View File

@ -49,7 +49,7 @@ dependencies {
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1' 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.core:jackson-annotations:2.6.0'
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}" 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, // 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 // and whitelist this hack in JarHell

View File

@ -103,7 +103,7 @@ dependencies {
compile 'com.carrotsearch:hppc:0.7.1' compile 'com.carrotsearch:hppc:0.7.1'
// time handling, remove with java 8 time // time handling, remove with java 8 time
compile 'joda-time:joda-time:2.10' compile "joda-time:joda-time:${versions.joda}"
// percentiles aggregation // percentiles aggregation
compile 'com.tdunning:t-digest:3.2' compile 'com.tdunning:t-digest:3.2'

View File

@ -0,0 +1 @@
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

View File

@ -1 +0,0 @@
f66c8125d1057ffce6c4e29e624cac863e110e2b

View File

@ -66,7 +66,6 @@ public class DateTimeUnitTests extends ESTestCase {
assertEquals(SECOND_OF_MINUTE, DateTimeUnit.resolve((byte) 8)); assertEquals(SECOND_OF_MINUTE, DateTimeUnit.resolve((byte) 8));
} }
@AwaitsFix(bugUrl="https://github.com/elastic/elasticsearch/issues/33749")
public void testConversion() { public void testConversion() {
long millis = randomLongBetween(0, Instant.now().toEpochMilli()); long millis = randomLongBetween(0, Instant.now().toEpochMilli());
DateTimeZone zone = randomDateTimeZone(); DateTimeZone zone = randomDateTimeZone();

View File

@ -21,7 +21,7 @@ dependencies {
} }
compile xpackProject('plugin:sql:sql-proto') compile xpackProject('plugin:sql:sql-proto')
compile "org.apache.lucene:lucene-core:${versions.lucene}" 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 "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
runtime "org.apache.logging.log4j:log4j-api:${versions.log4j}" runtime "org.apache.logging.log4j:log4j-api:${versions.log4j}"
runtime "org.apache.logging.log4j:log4j-core:${versions.log4j}" runtime "org.apache.logging.log4j:log4j-core:${versions.log4j}"
@ -138,4 +138,4 @@ thirdPartyAudit.excludes = [
'org.zeromq.ZMQ$Context', 'org.zeromq.ZMQ$Context',
'org.zeromq.ZMQ$Socket', 'org.zeromq.ZMQ$Socket',
'org.zeromq.ZMQ' 'org.zeromq.ZMQ'
] ]

View File

@ -0,0 +1 @@
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

View File

@ -1 +0,0 @@
f66c8125d1057ffce6c4e29e624cac863e110e2b

View File

@ -14,7 +14,7 @@ dependencies {
compile (project(':libs:x-content')) { compile (project(':libs:x-content')) {
transitive = false 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}" runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
testCompile "org.elasticsearch.test:framework:${version}" testCompile "org.elasticsearch.test:framework:${version}"

View File

@ -0,0 +1 @@
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

View File

@ -1 +0,0 @@
f66c8125d1057ffce6c4e29e624cac863e110e2b