From b78b3edeea90bbe8c8ce3dc501a3db1bf95f9dfe Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Wed, 17 Jun 2020 07:34:24 -0400 Subject: [PATCH] Upgrade to JNA 5.5.0 (#58183) This commit bumps our JNA dependency from 4.5.1 to 5.5.0, so that we are now on the latest maintained line, and pick up a large collection of bug fixes that have accumulated. --- buildSrc/build.gradle | 2 +- buildSrc/version.properties | 2 +- server/licenses/jna-4.5.1.jar.sha1 | 1 - server/licenses/jna-5.5.0.jar.sha1 | 1 + .../xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 server/licenses/jna-4.5.1.jar.sha1 create mode 100644 server/licenses/jna-5.5.0.jar.sha1 diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 35268f70324..20f3a16b632 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -120,7 +120,7 @@ dependencies { compile 'com.netflix.nebula:nebula-publishing-plugin:4.4.4' compile 'com.netflix.nebula:gradle-info-plugin:7.1.3' compile 'org.apache.rat:apache-rat:0.11' - compile "org.elasticsearch:jna:4.5.1" + compile "org.elasticsearch:jna:5.5.0" compile 'com.github.jengelman.gradle.plugins:shadow:5.1.0' compile 'de.thetaphi:forbiddenapis:3.0' compile 'com.avast.gradle:gradle-docker-compose-plugin:0.8.12' diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 96e8d879283..23a23f5d96f 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -18,7 +18,7 @@ log4j = 2.11.1 slf4j = 1.6.2 # when updating the JNA version, also update the version in buildSrc/build.gradle -jna = 4.5.1 +jna = 5.5.0 netty = 4.1.49.Final joda = 2.10.4 diff --git a/server/licenses/jna-4.5.1.jar.sha1 b/server/licenses/jna-4.5.1.jar.sha1 deleted file mode 100644 index f03d0d1fc7e..00000000000 --- a/server/licenses/jna-4.5.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -da10908ae23dc59b19dc258e63aea1c44621dc3a \ No newline at end of file diff --git a/server/licenses/jna-5.5.0.jar.sha1 b/server/licenses/jna-5.5.0.jar.sha1 new file mode 100644 index 00000000000..903d2bd4cd9 --- /dev/null +++ b/server/licenses/jna-5.5.0.jar.sha1 @@ -0,0 +1 @@ +ade077cbb2618a18bfc6c335413b2b7163d97601 \ No newline at end of file diff --git a/x-pack/plugin/ml/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java b/x-pack/plugin/ml/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java index 5127b36b007..474aa98c89d 100644 --- a/x-pack/plugin/ml/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java +++ b/x-pack/plugin/ml/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java @@ -58,7 +58,7 @@ public class NamedPipeHelperNoBootstrapTests extends LuceneTestCase { private static final int ERROR_PIPE_CONNECTED = 535; - private static final Pointer INVALID_HANDLE_VALUE = Pointer.createConstant(Pointer.SIZE == 8 ? -1 : 0xFFFFFFFFL); + private static final Pointer INVALID_HANDLE_VALUE = Pointer.createConstant(Native.POINTER_SIZE == 8 ? -1 : 0xFFFFFFFFL); static { // Have to use JNA for Windows named pipes