Add workaround for bug in detachedconfiguration handling in 8.13-rc-1

Author: breskeby

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/EmbeddedProviderExtension.java

@@ -12,6 +12,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.file.Directory;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.SourceSet;
@@ -37,7 +38,9 @@ void impl(String implName, Project implProject) {
         String projectName = implProject.getName();
         String capitalName = capitalize(projectName);
 
-        Configuration implConfig = project.getConfigurations().detachedConfiguration(project.getDependencies().create(implProject));
+        Dependency implDependency = project.getDependencies().create(implProject);
+        Configuration implConfig = project.getConfigurations().detachedConfiguration();
+        implConfig.getDependencies().add(implDependency);
         implConfig.attributes(attrs -> {
             attrs.attribute(ARTIFACT_TYPE_ATTRIBUTE, DIRECTORY_TYPE);
             attrs.attribute(EmbeddedProviderPlugin.IMPL_ATTR, true);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/ElasticsearchDistributionExtension.java

@@ -34,7 +34,9 @@ public ElasticsearchDistributionExtension(Project project) {
     private Configuration moduleZip(Project module) {
         var moduleConfigurationCoords = Map.of("path", module.getPath(), "configuration", EXPLODED_BUNDLE_CONFIG);
         var dep = project.getDependencies().project(moduleConfigurationCoords);
-        return project.getConfigurations().detachedConfiguration(dep);
+        Configuration detachedConfiguration = project.getConfigurations().detachedConfiguration();
+        detachedConfiguration.getDependencies().add(dep);
+        return detachedConfiguration;
     }
 
     public void copyModule(TaskProvider<? extends AbstractCopyTask> copyTask, Project module) {

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java

@@ -247,7 +247,8 @@ public void setTestDistribution(TestDistribution distribution) {
 
     private void registerExtractedConfig(Provider<RegularFile> pluginProvider) {
         Dependency pluginDependency = this.project.getDependencies().create(project.files(pluginProvider));
-        Configuration extractedConfig = project.getConfigurations().detachedConfiguration(pluginDependency);
+        Configuration extractedConfig = project.getConfigurations().detachedConfiguration();
+        extractedConfig.getDependencies().add(pluginDependency);
         extractedConfig.getAttributes().attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.DIRECTORY_TYPE);
         extractedConfig.getAttributes().attribute(BUNDLE_ATTRIBUTE, true);
         pluginAndModuleConfiguration.from(extractedConfig);
@@ -296,7 +297,9 @@ Collection<Configuration> getPluginAndModuleConfigurations() {
     private Provider<RegularFile> maybeCreatePluginOrModuleDependency(String path, String consumingConfiguration) {
         var configuration = pluginAndModuleConfigurations.computeIfAbsent(path, key -> {
             var bundleDependency = this.project.getDependencies().project(Map.of("path", path, "configuration", consumingConfiguration));
-            return project.getConfigurations().detachedConfiguration(bundleDependency);
+            Configuration detachedConfiguration = project.getConfigurations().detachedConfiguration();
+            detachedConfiguration.getDependencies().add(bundleDependency);
+            return detachedConfiguration;
         });
 
         Provider<File> fileProvider = configuration.getElements()