From 3e57425a642f3d45f52eddcbb6c6444645f03086 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 6 Jul 2018 10:00:32 -0400 Subject: [PATCH 1/2] Build: Switch integ-test-zip to OSS-only I think we meant to do this all along but mistakenly didn't. --- distribution/archives/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle index 16b2a8a7a6ce6..d6f9ae600228f 100644 --- a/distribution/archives/build.gradle +++ b/distribution/archives/build.gradle @@ -102,7 +102,7 @@ Closure commonZipConfig = { task buildIntegTestZip(type: Zip) { configure(commonZipConfig) - with archiveFiles(transportModulesFiles, 'zip', false) + with archiveFiles(transportModulesFiles, 'zip', true) } task buildZip(type: Zip) { From 1628baf2116d5b978f88c51b53d7442384d5ac2c Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 6 Jul 2018 12:23:20 -0400 Subject: [PATCH 2/2] Switch expected license --- distribution/archives/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle index d6f9ae600228f..3c6780cba84e9 100644 --- a/distribution/archives/build.gradle +++ b/distribution/archives/build.gradle @@ -193,7 +193,7 @@ subprojects { onlyIf toolExists doLast { final String licenseFilename - if (project.name.contains('oss-')) { + if (project.name.contains('oss-') || project.name == 'integ-test-zip') { licenseFilename = "APACHE-LICENSE-2.0.txt" } else { licenseFilename = "ELASTIC-LICENSE.txt"