Jelajahi Sumber

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
Christoph Büscher 7 tahun lalu
induk
melakukan
09cac321e7

+ 1 - 0
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

+ 1 - 1
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}"

+ 1 - 1
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 

+ 1 - 1
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'

+ 1 - 0
server/licenses/joda-time-2.10.1.jar.sha1

@@ -0,0 +1 @@
+9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

+ 0 - 1
server/licenses/joda-time-2.10.jar.sha1

@@ -1 +0,0 @@
-f66c8125d1057ffce6c4e29e624cac863e110e2b

+ 0 - 1
server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java

@@ -66,7 +66,6 @@ public class DateTimeUnitTests extends ESTestCase {
         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();

+ 2 - 2
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'
-]
+]

+ 1 - 0
x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.1.jar.sha1

@@ -0,0 +1 @@
+9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

+ 0 - 1
x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1

@@ -1 +0,0 @@
-f66c8125d1057ffce6c4e29e624cac863e110e2b

+ 1 - 1
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}"

+ 1 - 0
x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.1.jar.sha1

@@ -0,0 +1 @@
+9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

+ 0 - 1
x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1

@@ -1 +0,0 @@
-f66c8125d1057ffce6c4e29e624cac863e110e2b