Skip to content

Commit 54085b0

Browse files
committed
Remove colons from task and configuration names
Gradle 5.0 will remove support for colons in configuration and task names. This commit fixes this for our build by removing all current uses of colons in configuration and task names. Relates #27305
1 parent 94c9331 commit 54085b0

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class BuildPlugin implements Plugin<Project> {
238238

239239
/** Return the configuration name used for finding transitive deps of the given dependency. */
240240
private static String transitiveDepConfigName(String groupId, String artifactId, String version) {
241-
return "_transitive_${groupId}:${artifactId}:${version}"
241+
return "_transitive_${groupId}_${artifactId}_${version}"
242242
}
243243

244244
/**

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ class ClusterFormationTasks {
408408

409409
Project pluginProject = plugin.getValue()
410410
verifyProjectHasBuildPlugin(name, node.nodeVersion, project, pluginProject)
411-
String configurationName = "_plugin_${prefix}_${pluginProject.path}"
411+
String configurationName = pluginConfigurationName(prefix, pluginProject)
412412
Configuration configuration = project.configurations.findByName(configurationName)
413413
if (configuration == null) {
414414
configuration = project.configurations.create(configurationName)
@@ -437,13 +437,21 @@ class ClusterFormationTasks {
437437
return copyPlugins
438438
}
439439

440+
private static String pluginConfigurationName(final String prefix, final Project project) {
441+
return "_plugin_${prefix}_${project.path}".replace(':', '_')
442+
}
443+
444+
private static String pluginBwcConfigurationName(final String prefix, final Project project) {
445+
return "_plugin_bwc_${prefix}_${project.path}".replace(':', '_')
446+
}
447+
440448
/** Configures task to copy a plugin based on a zip file resolved using dependencies for an older version */
441449
static Task configureCopyBwcPluginsTask(String name, Project project, Task setup, NodeInfo node, String prefix) {
442450
Configuration bwcPlugins = project.configurations.getByName("${prefix}_elasticsearchBwcPlugins")
443451
for (Map.Entry<String, Project> plugin : node.config.plugins.entrySet()) {
444452
Project pluginProject = plugin.getValue()
445453
verifyProjectHasBuildPlugin(name, node.nodeVersion, project, pluginProject)
446-
String configurationName = "_plugin_bwc_${prefix}_${pluginProject.path}"
454+
String configurationName = pluginBwcConfigurationName(prefix, pluginProject)
447455
Configuration configuration = project.configurations.findByName(configurationName)
448456
if (configuration == null) {
449457
configuration = project.configurations.create(configurationName)
@@ -481,9 +489,9 @@ class ClusterFormationTasks {
481489
static Task configureInstallPluginTask(String name, Project project, Task setup, NodeInfo node, Project plugin, String prefix) {
482490
final FileCollection pluginZip;
483491
if (node.nodeVersion != VersionProperties.elasticsearch) {
484-
pluginZip = project.configurations.getByName("_plugin_bwc_${prefix}_${plugin.path}")
492+
pluginZip = project.configurations.getByName(pluginBwcConfigurationName(prefix, plugin))
485493
} else {
486-
pluginZip = project.configurations.getByName("_plugin_${prefix}_${plugin.path}")
494+
pluginZip = project.configurations.getByName(pluginConfigurationName(prefix, plugin))
487495
}
488496
// delay reading the file location until execution time by wrapping in a closure within a GString
489497
final Object file = "${-> new File(node.pluginsTmpDir, pluginZip.singleFile.getName()).toURI().toURL().toString()}"

plugins/repository-hdfs/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ List<String> principals = [ "elasticsearch", "hdfs/hdfs.build.elastic.co" ]
106106
String realm = "BUILD.ELASTIC.CO"
107107

108108
for (String principal : principals) {
109-
Task create = project.tasks.create("addPrincipal#${principal}", org.elasticsearch.gradle.vagrant.VagrantCommandTask) {
109+
Task create = project.tasks.create("addPrincipal#${principal}".replace('/', '_'), org.elasticsearch.gradle.vagrant.VagrantCommandTask) {
110110
command 'ssh'
111111
args '--command', "sudo bash /vagrant/src/main/resources/provision/addprinc.sh $principal"
112112
boxName box

0 commit comments

Comments
 (0)