Skip to content

Commit 8cc0dcb

Browse files
committed
Build: Switch integ-test-zip to OSS-only (#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 67c9b55 commit 8cc0dcb

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

distribution/archives/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ tasks.withType(AbstractArchiveTask) {
105105
}
106106

107107
task buildIntegTestZip(type: Zip) {
108-
with archiveFiles(transportModulesFiles, 'zip', false)
108+
with archiveFiles(transportModulesFiles, 'zip', true)
109109
}
110110

111111
task buildZip(type: Zip) {
@@ -194,7 +194,7 @@ subprojects {
194194
onlyIf toolExists
195195
doLast {
196196
final String licenseFilename
197-
if (project.name.contains('oss-')) {
197+
if (project.name.contains('oss-') || project.name == 'integ-test-zip') {
198198
licenseFilename = "APACHE-LICENSE-2.0.txt"
199199
} else {
200200
licenseFilename = "ELASTIC-LICENSE.txt"
@@ -324,4 +324,3 @@ configure(subprojects.findAll { it.name.contains('zip') }) {
324324
}
325325
}
326326
}
327-

0 commit comments

Comments
 (0)