From 8c9902533167d6311cbfa01662a9f608a22f337c Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Wed, 18 Jul 2018 11:11:33 +0200 Subject: [PATCH 1/2] Dependencies: Upgrade to joda time 2.10 Changelog: http://www.joda.org/joda-time/changes-report.html --- server/build.gradle | 2 +- server/licenses/joda-time-2.10.jar.sha1 | 1 + server/licenses/joda-time-2.9.9.jar.sha1 | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 server/licenses/joda-time-2.10.jar.sha1 delete mode 100644 server/licenses/joda-time-2.9.9.jar.sha1 diff --git a/server/build.gradle b/server/build.gradle index 7db073f43a5ca..72d7641ee4500 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -106,7 +106,7 @@ dependencies { compile 'com.carrotsearch:hppc:0.7.1' // time handling, remove with java 8 time - compile 'joda-time:joda-time:2.9.9' + compile 'joda-time:joda-time:2.10' // percentiles aggregation compile 'com.tdunning:t-digest:3.2' diff --git a/server/licenses/joda-time-2.10.jar.sha1 b/server/licenses/joda-time-2.10.jar.sha1 new file mode 100644 index 0000000000000..a597eabc654bf --- /dev/null +++ b/server/licenses/joda-time-2.10.jar.sha1 @@ -0,0 +1 @@ +f66c8125d1057ffce6c4e29e624cac863e110e2b \ No newline at end of file diff --git a/server/licenses/joda-time-2.9.9.jar.sha1 b/server/licenses/joda-time-2.9.9.jar.sha1 deleted file mode 100644 index 4009932ea3beb..0000000000000 --- a/server/licenses/joda-time-2.9.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7b520c458572890807d143670c9b24f4de90897 \ No newline at end of file From 9ede0d60815e0767eeaa9fbc6d0ba921bfd69e26 Mon Sep 17 00:00:00 2001 From: Alexander Reelsen Date: Thu, 19 Jul 2018 16:05:42 +0200 Subject: [PATCH 2/2] replace joda time dependency in sql with 2.10 --- x-pack/plugin/sql/sql-action/build.gradle | 2 +- x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1 | 1 + x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1 | 1 - x-pack/plugin/sql/sql-proto/build.gradle | 2 +- x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1 | 1 + x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1 | 1 - 6 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1 diff --git a/x-pack/plugin/sql/sql-action/build.gradle b/x-pack/plugin/sql/sql-action/build.gradle index d8805d2e3db51..f6b5177d50833 100644 --- a/x-pack/plugin/sql/sql-action/build.gradle +++ b/x-pack/plugin/sql/sql-action/build.gradle @@ -24,7 +24,7 @@ dependencies { } compile xpackProject('plugin:sql:sql-proto') compile "org.apache.lucene:lucene-core:${versions.lucene}" - compile 'joda-time:joda-time:2.9.9' + compile 'joda-time:joda-time:2.10' 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}" diff --git a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1 new file mode 100644 index 0000000000000..a597eabc654bf --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.10.jar.sha1 @@ -0,0 +1 @@ +f66c8125d1057ffce6c4e29e624cac863e110e2b \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1 deleted file mode 100644 index 4009932ea3beb..0000000000000 --- a/x-pack/plugin/sql/sql-action/licenses/joda-time-2.9.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7b520c458572890807d143670c9b24f4de90897 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-proto/build.gradle b/x-pack/plugin/sql/sql-proto/build.gradle index 5a1439f4360bc..7f26176e3c7a7 100644 --- a/x-pack/plugin/sql/sql-proto/build.gradle +++ b/x-pack/plugin/sql/sql-proto/build.gradle @@ -17,7 +17,7 @@ dependencies { compile (project(':libs:x-content')) { transitive = false } - compile 'joda-time:joda-time:2.9.9' + compile 'joda-time:joda-time:2.10' runtime "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" testCompile "org.elasticsearch.test:framework:${version}" diff --git a/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1 new file mode 100644 index 0000000000000..a597eabc654bf --- /dev/null +++ b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.10.jar.sha1 @@ -0,0 +1 @@ +f66c8125d1057ffce6c4e29e624cac863e110e2b \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1 b/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1 deleted file mode 100644 index 4009932ea3beb..0000000000000 --- a/x-pack/plugin/sql/sql-proto/licenses/joda-time-2.9.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f7b520c458572890807d143670c9b24f4de90897 \ No newline at end of file