From 7d18eaf3a49732ced1ec3e92b5aa82790368bff2 Mon Sep 17 00:00:00 2001
From: xuezhou25 <85715413+xuezhou25@users.noreply.github.com>
Date: Tue, 3 Aug 2021 10:52:53 -0700
Subject: [PATCH] Replaced custom built JNA by official JNA distribution.
 (#1003)

Signed-off-by: Xue Zhou <xuezhou@amazon.com>
---
 buildSrc/build.gradle                                         | 2 +-
 .../org/opensearch/gradle/plugin/PluginBuildPlugin.groovy     | 2 +-
 server/build.gradle                                           | 4 ++--
 server/licenses/jna-5.5.0.jar.sha1                            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 7205f0f9d74..13b8f61156e 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -108,7 +108,7 @@ dependencies {
   api 'com.netflix.nebula:nebula-publishing-plugin:4.4.4'
   api 'com.netflix.nebula:gradle-info-plugin:7.1.3'
   api 'org.apache.rat:apache-rat:0.11'
-  api "org.elasticsearch:jna:5.5.0"
+  api "net.java.dev.jna:jna:5.5.0"
   api 'com.github.jengelman.gradle.plugins:shadow:6.0.0'
   api 'de.thetaphi:forbiddenapis:3.0'
   api 'com.avast.gradle:gradle-docker-compose-plugin:0.12.1'
diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
index d69972a25b2..427e3f2740a 100644
--- a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
@@ -175,7 +175,7 @@ class PluginBuildPlugin implements Plugin<Project> {
             compileOnly "org.locationtech.jts:jts-core:${project.versions.jts}"
             compileOnly "org.apache.logging.log4j:log4j-api:${project.versions.log4j}"
             compileOnly "org.apache.logging.log4j:log4j-core:${project.versions.log4j}"
-            compileOnly "org.elasticsearch:jna:${project.versions.jna}"
+            compileOnly "net.java.dev.jna:jna:${project.versions.jna}"
         }
     }
 
diff --git a/server/build.gradle b/server/build.gradle
index fe9733ea306..923e80d61d6 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -131,8 +131,8 @@ dependencies {
   api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}", optional
 
-  // repackaged jna with native bits linked against all supported platforms
-  api "org.elasticsearch:jna:${versions.jna}"
+  // jna
+  api "net.java.dev.jna:jna:${versions.jna}"
 
   testImplementation(project(":test:framework")) {
     // tests use the locally compiled version of server
diff --git a/server/licenses/jna-5.5.0.jar.sha1 b/server/licenses/jna-5.5.0.jar.sha1
index 903d2bd4cd9..5621dfc743d 100644
--- a/server/licenses/jna-5.5.0.jar.sha1
+++ b/server/licenses/jna-5.5.0.jar.sha1
@@ -1 +1 @@
-ade077cbb2618a18bfc6c335413b2b7163d97601
\ No newline at end of file
+0e0845217c4907822403912ad6828d8e0b256208