Remove JNA from server dependencies (elastic#110809)

All native methods are now bound through NativeAccess. This commit removes the jna dependency from server. relates elastic#104876
leemthompo · Jul 13, 2024 · e6713a5 · e6713a5
1 parent e4349f8
commit e6713a5
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 74 deletions.
diff --git a/libs/native/jna/build.gradle b/libs/native/jna/build.gradle
@@ -15,8 +15,7 @@ base {
 dependencies {
   compileOnly project(':libs:elasticsearch-core')
   compileOnly project(':libs:elasticsearch-native')
-  // TODO: this will become an implementation dep onces jna is removed from server
-  compileOnly "net.java.dev.jna:jna:${versions.jna}"
+  implementation "net.java.dev.jna:jna:${versions.jna}"
 
   testImplementation(project(":test:framework")) {
     exclude group: 'org.elasticsearch', module: 'elasticsearch-native'

diff --git a/server/licenses/jna-LICENSE.txt → libs/native/jna/licenses/jna-LICENSE.txt b/server/licenses/jna-LICENSE.txt → libs/native/jna/licenses/jna-LICENSE.txt
diff --git a/server/licenses/jna-NOTICE.txt → libs/native/jna/licenses/jna-NOTICE.txt b/server/licenses/jna-NOTICE.txt → libs/native/jna/licenses/jna-NOTICE.txt
diff --git a/server/build.gradle b/server/build.gradle
@@ -68,7 +68,6 @@ dependencies {
 
   // access to native functions
   implementation project(':libs:elasticsearch-native')
-  api "net.java.dev.jna:jna:${versions.jna}"
 
   api "co.elastic.logging:log4j2-ecs-layout:${versions.ecsLogging}"
   api "co.elastic.logging:ecs-logging-core:${versions.ecsLogging}"

diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java
@@ -34,7 +34,6 @@
     requires org.elasticsearch.tdigest;
     requires org.elasticsearch.simdvec;
 
-    requires com.sun.jna;
     requires hppc;
     requires HdrHistogram;
     requires jopt.simple;

diff --git a/server/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java b/server/src/main/java/org/elasticsearch/bootstrap/JNACLibrary.java
diff --git a/server/src/main/resources/org/elasticsearch/bootstrap/security.policy b/server/src/main/resources/org/elasticsearch/bootstrap/security.policy
@@ -67,11 +67,6 @@ grant codeBase "${codebase.elasticsearch-cli}" {
   permission java.util.PropertyPermission "*", "read,write";
 };
 
-grant codeBase "${codebase.jna}" {
-  // for registering native methods
-  permission java.lang.RuntimePermission "accessDeclaredMembers";
-};
-
 grant codeBase "${codebase.log4j-api}" {
   permission java.lang.RuntimePermission "getClassLoader";
 };

diff --git a/x-pack/plugin/ml/qa/no-bootstrap-tests/build.gradle b/x-pack/plugin/ml/qa/no-bootstrap-tests/build.gradle
@@ -3,4 +3,5 @@ apply plugin: 'elasticsearch.standalone-test'
 dependencies {
   testImplementation project(":x-pack:plugin:core")
   testImplementation project(path: xpackModule('ml'))
+  testImplementation "net.java.dev.jna:jna:${versions.jna}"
 }
diff --git a/x-pack/plugin/sql/sql-cli/build.gradle b/x-pack/plugin/sql/sql-cli/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 
   api project(':x-pack:plugin:sql:sql-client')
   api project(":libs:elasticsearch-cli")
-  runtimeOnly "net.java.dev.jna:jna:${versions.jna}"
+  implementation "net.java.dev.jna:jna:${versions.jna}"
   testImplementation project(":test:framework")
 }