Skip to content

Commit 20cafd3

Browse files
authored
Build: Switch integ-test-zip to OSS-only (elastic#31866)
We mistakenly enabled bundling of the default distribution's bin scripts into the `integ-test-zip` artifact used by plugin authors to test plugins. These didn't change the version of Elasticsearch used for testing but as a side effect changed the LICENSE.txt from the Apache 2 license to the Elastic license. We really didn't mean for that to happen. The bin script and the elasticsearch-sql-cli jar file bundled into the distribution are indeed governed by the Elastic license but we didn't intend for them to be in the testing artifact in the first place. This removes them and fixes the license of the `integ-test-zip` artifact.
1 parent 9ffb26a commit 20cafd3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

distribution/archives/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Closure commonZipConfig = {
102102

103103
task buildIntegTestZip(type: Zip) {
104104
configure(commonZipConfig)
105-
with archiveFiles(transportModulesFiles, 'zip', false)
105+
with archiveFiles(transportModulesFiles, 'zip', true)
106106
}
107107

108108
task buildZip(type: Zip) {
@@ -193,7 +193,7 @@ subprojects {
193193
onlyIf toolExists
194194
doLast {
195195
final String licenseFilename
196-
if (project.name.contains('oss-')) {
196+
if (project.name.contains('oss-') || project.name == 'integ-test-zip') {
197197
licenseFilename = "APACHE-LICENSE-2.0.txt"
198198
} else {
199199
licenseFilename = "ELASTIC-LICENSE.txt"

0 commit comments

Comments
 (0)