Skip to content

Commit

Permalink
Build: Switch jna dependency to an elastic version (#24081)
Browse files Browse the repository at this point in the history
This new version of jna is rebuilt from the official release of jna, but
with native libs linked against older glibc in order to support all
platforms elasticsearch supports.

closes #23640
  • Loading branch information
rjernst committed Apr 13, 2017
1 parent 215a9b2 commit fb3a281
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class PluginBuildPlugin extends BuildPlugin {
provided "com.vividsolutions:jts:${project.versions.jts}"
provided "org.apache.logging.log4j:log4j-api:${project.versions.log4j}"
provided "org.apache.logging.log4j:log4j-core:${project.versions.log4j}"
provided "net.java.dev.jna:jna:${project.versions.jna}"
provided "org.elasticsearch:jna:${project.versions.jna}"
}
}

Expand Down
3 changes: 2 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ dependencies {
// to bridge dependencies that are still on Log4j 1 to Log4j 2
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}", optional

compile "net.java.dev.jna:jna:${versions.jna}"
// repackaged jna with native bits linked against all elastic supported platforms
compile "org.elasticsearch:jna:${versions.jna}"

if (isEclipse == false || project.path == ":core-tests") {
testCompile("org.elasticsearch.test:framework:${version}") {
Expand Down
2 changes: 1 addition & 1 deletion core/licenses/jna-4.4.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cb208278274bf12ebdb56c61bd7407e6f774d65a
6edc9b4514969d768039acf43f04210b15658cd7

0 comments on commit fb3a281

Please sign in to comment.