|
@@ -425,7 +425,7 @@ class ClusterFormationTasks {
|
|
|
|
|
|
Project pluginProject = plugin.getValue()
|
|
|
verifyProjectHasBuildPlugin(name, node.nodeVersion, project, pluginProject)
|
|
|
- String configurationName = "_plugin_${prefix}_${pluginProject.path}"
|
|
|
+ String configurationName = pluginConfigurationName(prefix, pluginProject)
|
|
|
Configuration configuration = project.configurations.findByName(configurationName)
|
|
|
if (configuration == null) {
|
|
|
configuration = project.configurations.create(configurationName)
|
|
@@ -454,13 +454,21 @@ class ClusterFormationTasks {
|
|
|
return copyPlugins
|
|
|
}
|
|
|
|
|
|
+ private static String pluginConfigurationName(final String prefix, final Project project) {
|
|
|
+ return "_plugin_${prefix}_${project.path}".replace(':', '_')
|
|
|
+ }
|
|
|
+
|
|
|
+ private static String pluginBwcConfigurationName(final String prefix, final Project project) {
|
|
|
+ return "_plugin_bwc_${prefix}_${project.path}".replace(':', '_')
|
|
|
+ }
|
|
|
+
|
|
|
/** Configures task to copy a plugin based on a zip file resolved using dependencies for an older version */
|
|
|
static Task configureCopyBwcPluginsTask(String name, Project project, Task setup, NodeInfo node, String prefix) {
|
|
|
Configuration bwcPlugins = project.configurations.getByName("${prefix}_elasticsearchBwcPlugins")
|
|
|
for (Map.Entry<String, Project> plugin : node.config.plugins.entrySet()) {
|
|
|
Project pluginProject = plugin.getValue()
|
|
|
verifyProjectHasBuildPlugin(name, node.nodeVersion, project, pluginProject)
|
|
|
- String configurationName = "_plugin_bwc_${prefix}_${pluginProject.path}"
|
|
|
+ String configurationName = pluginBwcConfigurationName(prefix, pluginProject)
|
|
|
Configuration configuration = project.configurations.findByName(configurationName)
|
|
|
if (configuration == null) {
|
|
|
configuration = project.configurations.create(configurationName)
|
|
@@ -499,9 +507,9 @@ class ClusterFormationTasks {
|
|
|
static Task configureInstallPluginTask(String name, Project project, Task setup, NodeInfo node, Project plugin, String prefix) {
|
|
|
final FileCollection pluginZip;
|
|
|
if (node.nodeVersion != VersionProperties.elasticsearch) {
|
|
|
- pluginZip = project.configurations.getByName("_plugin_bwc_${prefix}_${plugin.path}")
|
|
|
+ pluginZip = project.configurations.getByName(pluginBwcConfigurationName(prefix, plugin))
|
|
|
} else {
|
|
|
- pluginZip = project.configurations.getByName("_plugin_${prefix}_${plugin.path}")
|
|
|
+ pluginZip = project.configurations.getByName(pluginConfigurationName(prefix, plugin))
|
|
|
}
|
|
|
// delay reading the file location until execution time by wrapping in a closure within a GString
|
|
|
final Object file = "${-> new File(node.pluginsTmpDir, pluginZip.singleFile.getName()).toURI().toURL().toString()}"
|