Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build: Switch jna dependency to an elastic version #24081

Merged
merged 4 commits into from
Apr 13, 2017
Merged

Build: Switch jna dependency to an elastic version #24081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
348e46d
Build: Switch jna dependency to an elastic version
rjernst Apr 13, 2017
468bb85
update sha
rjernst Apr 13, 2017
5e7dad1
fix plugin provided version of jna
rjernst Apr 13, 2017
ab026e8
Merge branch 'master' into our_jna
rjernst Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cb208278274bf12ebdb56c61bd7407e6f774d65a
6edc9b4514969d768039acf43f04210b15658cd7