summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNik Everett <nik9000@gmail.com>2016-03-29 15:37:36 -0400
committerNik Everett <nik9000@gmail.com>2016-03-29 17:52:23 -0400
commit101a32573c0eeb3abe70cc1ead569b719ddbef75 (patch)
tree65a11c369df064695048527909f74c7babe0517d
parent19eeb68bc4b9c404ff95f70de3dcc70f433bcead (diff)
Don't try to use system jna for naming conventions
When we test we add `-Djna.nosys=true` to the system properties but we don't add it to system properties when running the naming conventions test. This was causing the build to fail on a newly minted Ubuntu 15.10 machine, presumably because I made the mistake of installing maven using the system package manager.
-rw-r--r--buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/NamingConventionsTask.groovy1
1 files changed, 1 insertions, 0 deletions
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/NamingConventionsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/NamingConventionsTask.groovy
index 672d208c01..612bc56862 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/NamingConventionsTask.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/NamingConventionsTask.groovy
@@ -68,6 +68,7 @@ public class NamingConventionsTask extends LoggedExec {
*/
project.afterEvaluate {
doFirst {
+ args('-Djna.nosys=true')
args('-cp', classpath.asPath, 'org.elasticsearch.test.NamingConventionsCheck')
if (skipIntegTestInDisguise) {
args('--skip-integ-tests-in-disguise')