Skip to content

Commit 8594017

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 72399f0 commit 8594017

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

distribution/archives/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Closure commonZipConfig = {
113113

114114
task buildIntegTestZip(type: Zip) {
115115
configure(commonZipConfig)
116-
with archiveFiles(transportModulesFiles, 'zip', false)
116+
with archiveFiles(transportModulesFiles, 'zip', true)
117117
}
118118

119119
task buildZip(type: Zip) {
@@ -204,7 +204,7 @@ subprojects {
204204
onlyIf toolExists
205205
doLast {
206206
final String licenseFilename
207-
if (project.name.contains('oss-')) {
207+
if (project.name.contains('oss-') || project.name == 'integ-test-zip') {
208208
licenseFilename = "APACHE-LICENSE-2.0.txt"
209209
} else {
210210
licenseFilename = "ELASTIC-LICENSE.txt"

0 commit comments

Comments
 (0)