Skip to content

Commit 7a739c7

Browse files
author
Christoph Büscher
committed
Upgrade to Joda 2.10.1 (#35410)
This version contains several bugfixes. Closes #33749
1 parent d3ff838 commit 7a739c7

File tree

13 files changed

+11
-9
lines changed

13 files changed

+11
-9
lines changed

buildSrc/version.properties

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ slf4j = 1.6.2
1616
jna = 4.5.1
1717

1818
netty = 4.1.30.Final
19+
joda = 2.10.1
1920

2021
# test dependencies
2122
randomizedrunner = 2.7.0

plugins/repository-gcs/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
compile 'com.google.cloud:google-cloud-storage:1.40.0'
2727
compile 'com.google.cloud:google-cloud-core:1.40.0'
2828
compile 'com.google.guava:guava:20.0'
29-
compile 'joda-time:joda-time:2.10'
29+
compile "joda-time:joda-time:${versions.joda}"
3030
compile 'com.google.http-client:google-http-client:1.24.1'
3131
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
3232
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"

plugins/repository-s3/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies {
4949
compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7.1'
5050
compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.0'
5151
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
52-
compile 'joda-time:joda-time:2.10'
52+
compile "joda-time:joda-time:${versions.joda}"
5353

5454
// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
5555
// and whitelist this hack in JarHell

server/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ dependencies {
103103
compile 'com.carrotsearch:hppc:0.7.1'
104104

105105
// time handling, remove with java 8 time
106-
compile 'joda-time:joda-time:2.10'
106+
compile "joda-time:joda-time:${versions.joda}"
107107

108108
// percentiles aggregation
109109
compile 'com.tdunning:t-digest:3.2'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

server/licenses/joda-time-2.10.jar.sha1

-1
This file was deleted.

server/src/test/java/org/elasticsearch/common/rounding/DateTimeUnitTests.java

+1
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,5 @@ public void testEnumIds() {
5959
assertEquals(8, SECOND_OF_MINUTE.id());
6060
assertEquals(SECOND_OF_MINUTE, DateTimeUnit.resolve((byte) 8));
6161
}
62+
6263
}

x-pack/plugin/sql/sql-action/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
}
2222
compile xpackProject('plugin:sql:sql-proto')
2323
compile "org.apache.lucene:lucene-core:${versions.lucene}"
24-
compile 'joda-time:joda-time:2.10'
24+
compile "joda-time:joda-time:${versions.joda}"
2525
runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
2626
runtime "org.apache.logging.log4j:log4j-api:${versions.log4j}"
2727
runtime "org.apache.logging.log4j:log4j-core:${versions.log4j}"
@@ -138,4 +138,4 @@ thirdPartyAudit.excludes = [
138138
'org.zeromq.ZMQ$Context',
139139
'org.zeromq.ZMQ$Socket',
140140
'org.zeromq.ZMQ'
141-
]
141+
]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

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

-1
This file was deleted.

x-pack/plugin/sql/sql-proto/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
compile (project(':libs:x-content')) {
1515
transitive = false
1616
}
17-
compile 'joda-time:joda-time:2.10'
17+
compile "joda-time:joda-time:${versions.joda}"
1818
runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
1919

2020
testCompile "org.elasticsearch.test:framework:${version}"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

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

-1
This file was deleted.

0 commit comments

Comments
 (0)