From 37bb8f8075df5b7f79808f420119bffe57b07f49 Mon Sep 17 00:00:00 2001 From: Jay Modi Date: Thu, 10 May 2018 07:35:23 -0600 Subject: [PATCH] Build: move generated-resources to build (#30366) This commit moves the generated-resources directory to be within the build directory for the openldap-tests and saml-idp-tests projects. Both projects create a generated-resources directory that should have been in the build directory but were instead at the same level as the build directory. --- x-pack/qa/openldap-tests/build.gradle | 2 +- x-pack/qa/saml-idp-tests/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/qa/openldap-tests/build.gradle b/x-pack/qa/openldap-tests/build.gradle index 6aef9fa2892..24976ab6113 100644 --- a/x-pack/qa/openldap-tests/build.gradle +++ b/x-pack/qa/openldap-tests/build.gradle @@ -14,7 +14,7 @@ task openLdapFixture { dependsOn "vagrantCheckVersion", "virtualboxCheckVersion", idpFixtureProject.up } -String outputDir = "generated-resources/${project.name}" +String outputDir = "${project.buildDir}/generated-resources/${project.name}" task copyIdpTrust(type: Copy) { from idpFixtureProject.file('src/main/resources/certs/idptrust.jks'); into outputDir diff --git a/x-pack/qa/saml-idp-tests/build.gradle b/x-pack/qa/saml-idp-tests/build.gradle index 251311fe8cd..ebb0d88991f 100644 --- a/x-pack/qa/saml-idp-tests/build.gradle +++ b/x-pack/qa/saml-idp-tests/build.gradle @@ -16,7 +16,7 @@ task idpFixture { dependsOn "vagrantCheckVersion", "virtualboxCheckVersion", idpFixtureProject.up } -String outputDir = "generated-resources/${project.name}" +String outputDir = "${project.buildDir}/generated-resources/${project.name}" task copyIdpCertificate(type: Copy) { from idpFixtureProject.file('src/main/resources/certs/ca.crt'); into outputDir