Build: Change location in zip of license and notice inclusion for plugins (#23316)
This commit moves the LICENSE.txt and NOTICE.txt files for each plugin to be alongside the other plugin files, inside the elasticsearch subdir. This ensures those files are installed alongside the plugin.
This commit is contained in:
parent
18f57c05cf
commit
74ecd34fd7
|
@ -253,19 +253,15 @@ public class PluginBuildPlugin extends BuildPlugin {
|
|||
protected void addNoticeGeneration(Project project) {
|
||||
File licenseFile = project.pluginProperties.extension.licenseFile
|
||||
if (licenseFile != null) {
|
||||
project.bundlePlugin.into('/') {
|
||||
from(licenseFile.parentFile) {
|
||||
include(licenseFile.name)
|
||||
}
|
||||
project.bundlePlugin.from(licenseFile.parentFile) {
|
||||
include(licenseFile.name)
|
||||
}
|
||||
}
|
||||
File noticeFile = project.pluginProperties.extension.licenseFile
|
||||
if (noticeFile != null) {
|
||||
NoticeTask generateNotice = project.tasks.create('generateNotice', NoticeTask.class)
|
||||
generateNotice.dependencies(project)
|
||||
project.bundlePlugin.into('/') {
|
||||
from(generateNotice)
|
||||
}
|
||||
project.bundlePlugin.from(generateNotice)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue