Skip to content

Upgrade to Joda 2.10.1 #35410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/repository-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion plugins/repository-s3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions server/licenses/joda-time-2.10.1.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0
1 change: 0 additions & 1 deletion server/licenses/joda-time-2.10.jar.sha1

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/sql/sql-action/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -138,4 +138,4 @@ thirdPartyAudit.excludes = [
'org.zeromq.ZMQ$Context',
'org.zeromq.ZMQ$Socket',
'org.zeromq.ZMQ'
]
]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

This file was deleted.

2 changes: 1 addition & 1 deletion x-pack/plugin/sql/sql-proto/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9ac3dbf89dbf2ee385185dd0cd3064fe789efee0

This file was deleted.