diff --git a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java index f8c0c4daad69c6..95d3b4bbd2a663 100644 --- a/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java +++ b/test/framework/src/main/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java @@ -102,7 +102,6 @@ public void testFailure(Failure failure) throws Exception { } } b.append("\""); - GradleMessageBuilder gradleMessageBuilder = new GradleMessageBuilder(b); gradleMessageBuilder.appendAllOpts(failure.getDescription()); @@ -181,6 +180,7 @@ private ReproduceErrorMessageBuilder appendESProperties() { appendOpt("tests.timezone", TimeZone.getDefault().getID()); appendOpt("tests.distribution", System.getProperty("tests.distribution")); appendOpt("runtime.java", Integer.toString(JavaVersion.current().getVersion().get(0))); + appendOpt("license.key", System.getProperty("licence.key")); appendOpt(ESTestCase.FIPS_SYSPROP, System.getProperty(ESTestCase.FIPS_SYSPROP)); return this; } diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle index d327f0c48369f8..a840922d91c348 100644 --- a/x-pack/plugin/core/build.gradle +++ b/x-pack/plugin/core/build.gradle @@ -84,10 +84,11 @@ tasks.named("processResources").configure { } else { throw new IllegalArgumentException('Property license.key must be set for release build') } - if (Files.exists(Paths.get(licenseKey)) == false) { + File licenseKeyFile = rootProject.file(licenseKey) + if (licenseKeyFile.exists() == false) { throw new IllegalArgumentException('license.key at specified path [' + licenseKey + '] does not exist') } - from(licenseKey) { + from(licenseKeyFile) { rename { String filename -> 'public.key' } } }