Skip to content

Commit 881b0c0

Browse files
committed
Build: Fix meta plugin bundled plugin names (#29147)
This commit fixes the directory name bundled plugins are added under within a meta plugin to be the configured name of the bundled plugin, instead of the project name.
1 parent c245d53 commit 881b0c0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/MetaPluginBuildPlugin.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ class MetaPluginBuildPlugin implements Plugin<Project> {
8888
buildProperties.extension.plugins.each { String bundledPluginProjectName ->
8989
Project bundledPluginProject = project.project(bundledPluginProjectName)
9090
bundledPluginProject.afterEvaluate {
91+
String bundledPluginName = bundledPluginProject.esplugin.name
9192
bundle.configure {
9293
dependsOn bundledPluginProject.bundlePlugin
9394
from(project.zipTree(bundledPluginProject.bundlePlugin.outputs.files.singleFile)) {
9495
eachFile { FileCopyDetails details ->
9596
// we want each path to have the plugin name interjected
96-
details.relativePath = new RelativePath(true, bundledPluginProjectName, details.relativePath.toString())
97+
details.relativePath = new RelativePath(true, bundledPluginName, details.relativePath.toString())
9798
}
9899
}
99100
}

0 commit comments

Comments
 (0)