From 74ecd34fd7728be2010aec0711355a39c6278981 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 22 Feb 2017 16:13:50 -0800 Subject: [PATCH] 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. --- .../gradle/plugin/PluginBuildPlugin.groovy | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy index e955d5d507ca2..dfa58592a182e 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy @@ -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) } } }