Skip to content

Commit bdd0063

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 4f20698 commit bdd0063

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
@@ -239,7 +239,7 @@ class BuildPlugin implements Plugin<Project> {
239239

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

245245
/**

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

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

430430
Project pluginProject = plugin.getValue()
431431
verifyProjectHasBuildPlugin(name, node.nodeVersion, project, pluginProject)
432-
String configurationName = "_plugin_${prefix}_${pluginProject.path}"
432+
String configurationName = pluginConfigurationName(prefix, pluginProject)
433433
Configuration configuration = project.configurations.findByName(configurationName)
434434
if (configuration == null) {
435435
configuration = project.configurations.create(configurationName)
@@ -458,13 +458,21 @@ class ClusterFormationTasks {
458458
return copyPlugins
459459
}
460460

461+
private static String pluginConfigurationName(final String prefix, final Project project) {
462+
return "_plugin_${prefix}_${project.path}".replace(':', '_')
463+
}
464+
465+
private static String pluginBwcConfigurationName(final String prefix, final Project project) {
466+
return "_plugin_bwc_${prefix}_${project.path}".replace(':', '_')
467+
}
468+
461469
/** Configures task to copy a plugin based on a zip file resolved using dependencies for an older version */
462470
static Task configureCopyBwcPluginsTask(String name, Project project, Task setup, NodeInfo node, String prefix) {
463471
Configuration bwcPlugins = project.configurations.getByName("${prefix}_elasticsearchBwcPlugins")
464472
for (Map.Entry<String, Project> plugin : node.config.plugins.entrySet()) {
465473
Project pluginProject = plugin.getValue()
466474
verifyProjectHasBuildPlugin(name, node.nodeVersion, project, pluginProject)
467-
String configurationName = "_plugin_bwc_${prefix}_${pluginProject.path}"
475+
String configurationName = pluginBwcConfigurationName(prefix, pluginProject)
468476
Configuration configuration = project.configurations.findByName(configurationName)
469477
if (configuration == null) {
470478
configuration = project.configurations.create(configurationName)
@@ -503,9 +511,9 @@ class ClusterFormationTasks {
503511
static Task configureInstallPluginTask(String name, Project project, Task setup, NodeInfo node, Project plugin, String prefix) {
504512
final FileCollection pluginZip;
505513
if (node.nodeVersion != VersionProperties.elasticsearch) {
506-
pluginZip = project.configurations.getByName("_plugin_bwc_${prefix}_${plugin.path}")
514+
pluginZip = project.configurations.getByName(pluginBwcConfigurationName(prefix, plugin))
507515
} else {
508-
pluginZip = project.configurations.getByName("_plugin_${prefix}_${plugin.path}")
516+
pluginZip = project.configurations.getByName(pluginConfigurationName(prefix, plugin))
509517
}
510518
// delay reading the file location until execution time by wrapping in a closure within a GString
511519
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)